Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/
Date: Thu, 06 Jan 2022 00:13:00
Message-Id: 1641427965.d4880a49701681c1af2eb3bf428f4ce9b07802cb.mgorny@gentoo
1 commit: d4880a49701681c1af2eb3bf428f4ce9b07802cb
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 5 19:36:11 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 6 00:12:45 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4880a49
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.90
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 2 +
13 .../vanilla-kernel/vanilla-kernel-5.10.90.ebuild | 130 +++++++++++++++++++++
14 2 files changed, 132 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index c51424c92fb9..2a33f01f5475 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -21,6 +21,8 @@ DIST linux-5.10.88.tar.sign 991 BLAKE2B 8ba7edd3b3d0b96c5b9ab70d4290952c41327edd
21 DIST linux-5.10.88.tar.xz 116476744 BLAKE2B 89a496f0ec427061c04a5568bdfdf04ad4ca55b3c81853ae9f64d53608efd39d55d8f2074f7dbeb9424f6b9cf9b5d9674b98a05d24414dc0ccb076a9f9d27685 SHA512 b4400a65dee1e5e7bafff69012078e81467e9a7aeba0eaaa84137e7056b5b79893eb62ef4309a340b23770d3785a7d236e837e6f39f24e58db00a8b4d9190a4f
22 DIST linux-5.10.89.tar.sign 991 BLAKE2B ffd758cf40031ee8ada07514218d9c03cbdbf21eeb5c37d711150fdd391bdaaff7808d5690433ded38229b2ae504532002a9a7aaffad588b187b9a5e4c9ae7b6 SHA512 0c1bac99bd1920250826f7d14194084cbd179b42fdb62c9ba371a62ecf309b9152aac4e2f1fd3d982e136887d9d98e302b3288e2d22fe124c3009955b6c9186e
23 DIST linux-5.10.89.tar.xz 116486456 BLAKE2B d91cf085ec273b3ad3d128e4097d0841496c0e71fa330a09b2db878cc4a7c683f8444e7611f172ffee84fd2180a2037bdf57fdf4fc1e6995d3b044eb4ac1785c SHA512 a5c60d947246944c75bae0b62efa39580ecb9c1f57f141071de0055afde725c1d9ac95a78db55326b5e43388d44ba1c810b547239739115099297dc68e534674
24 +DIST linux-5.10.90.tar.sign 991 BLAKE2B c41b37ab6e42e5f89b2ca2e0ef84421a2419d137c58a21a497523162b6f576b2441a03900177bc0ba16702f819e88d401cc1f182cd94597f8b53d4e0b6ecefee SHA512 43b7a3ef71c342213a542d9836dc44825a3962ef742c109a75028943d4a7433bbb252ef756214b26f6f77d3b3d384c89a3913fef27b904b3694f72818291d3d4
25 +DIST linux-5.10.90.tar.xz 116480464 BLAKE2B 993cd26adddc38a811bbfbd4acc1d595660379d1d55eeaf7008681f13e198571554116e85a88ab90fe945688695831d364a426959bccda0d15d9b01ebe611a83 SHA512 0b31b025a7f65cfbe4cd77b059c74a087109daf4c8195e17f91f725feeb074b12e7db0f8333906e8216511723ca5cfb55230873a4351867c1b4962831646a51c
26 DIST linux-5.14.21.tar.sign 991 BLAKE2B 159182d90911e738c0693c839441f679b66fa3e75c61bb55251552b1ebb7bf6ad018d66d0a83a8f88935b88c1f39fea1207a94f3fd4af3d1e5d148cf9293baf9 SHA512 1c2639bfec52b2f8cfc69504b7f474d1d7a96dc1793e8cd77a6160718a5f381c5e57e42339bd5361e83b86c84cda2500d18615bfc210bbe989c0560b275f4918
27 DIST linux-5.14.21.tar.xz 120726436 BLAKE2B ced805df81421f328e2e08d50a33bf6ba54092e95c84d7c1c8ec25ad909c183f82c9966a074c274dd0d13b069b87c12c6f6d5593faf3c0813c4369f90fc4a24f SHA512 0f428cb7273de5b440b610b1a3709563e4ed955afb4df084750a8b43c45e5b000a5906780ff7079a8324fac0a8b7ecace778ab8bbf0511fba92d4dad160d7f87
28 DIST linux-5.15.11.tar.sign 991 BLAKE2B 42bed55a97098e8af2c9f33852b94806710e2df15a9fa8fa2199a1f3be133b89b9505e79f3e9c9663fcc5482249334f34a1c7a9315fc40741ff7302a60c4c823 SHA512 5ff3d7d368dd4481e003b00ed926f601520f53de020a507c5f9af506679e57958db0967752a600ee80cadbb0b19d33368007fb1d3c298045b30faed964da4714
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
31 new file mode 100644
32 index 000000000000..2d0af917a6cc
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.90.ebuild
35 @@ -0,0 +1,130 @@
36 +# Copyright 2020-2021 Gentoo Authors
37 +# Distributed under the terms of the GNU General Public License v2
38 +
39 +EAPI=7
40 +
41 +inherit kernel-build toolchain-funcs verify-sig
42 +
43 +MY_P=linux-${PV}
44 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
45 +CONFIG_VER=5.10.12
46 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
47 +GENTOO_CONFIG_VER=5.15.5
48 +
49 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
50 +HOMEPAGE="https://www.kernel.org/"
51 +SRC_URI+="
52 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
53 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
54 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
55 + verify-sig? (
56 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
57 + )
58 + amd64? (
59 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
60 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
61 + )
62 + arm64? (
63 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
64 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
65 + )
66 + ppc64? (
67 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
68 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
69 + )
70 + x86? (
71 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
72 + -> kernel-i686-fedora.config.${CONFIG_VER}
73 + )"
74 +S=${WORKDIR}/${MY_P}
75 +
76 +LICENSE="GPL-2"
77 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
78 +IUSE="debug hardened"
79 +REQUIRED_USE="arm? ( savedconfig )"
80 +
81 +RDEPEND="
82 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
83 +BDEPEND="
84 + debug? ( dev-util/pahole )
85 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}"
88 +
89 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
90 +
91 +src_unpack() {
92 + if use verify-sig; then
93 + einfo "Unpacking linux-${PV}.tar.xz ..."
94 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
95 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
96 + assert "Unpack failed"
97 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
98 + else
99 + default
100 + fi
101 +}
102 +
103 +src_prepare() {
104 + default
105 +
106 + local biendian=false
107 +
108 + # prepare the default config
109 + case ${ARCH} in
110 + amd64)
111 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
112 + ;;
113 + arm)
114 + return
115 + ;;
116 + arm64)
117 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
118 + biendian=true
119 + ;;
120 + ppc)
121 + # assume powermac/powerbook defconfig
122 + # we still package.use.force savedconfig
123 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
124 + ;;
125 + ppc64)
126 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
127 + biendian=true
128 + ;;
129 + x86)
130 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
131 + ;;
132 + *)
133 + die "Unsupported arch ${ARCH}"
134 + ;;
135 + esac
136 +
137 + local myversion="-dist"
138 + use hardened && myversion+="-hardened"
139 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
140 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
141 +
142 + local merge_configs=(
143 + "${T}"/version.config
144 + "${dist_conf_path}"/base.config
145 + )
146 + use debug || merge_configs+=(
147 + "${dist_conf_path}"/no-debug.config
148 + )
149 + if use hardened; then
150 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
151 +
152 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
153 +
154 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
155 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
156 + fi
157 + fi
158 +
159 + # this covers ppc64 and aarch64_be only for now
160 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
161 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
162 + fi
163 +
164 + kernel-build_merge_configs "${merge_configs[@]}"
165 +}