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: Tue, 08 Feb 2022 23:21:54
Message-Id: 1644362491.f4e5d50afd864fb1f4437d5b09b3d4a706a27a1a.mgorny@gentoo
1 commit: f4e5d50afd864fb1f4437d5b09b3d4a706a27a1a
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 8 19:22:36 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 8 23:21:31 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4e5d50a
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.99
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.99.ebuild | 131 +++++++++++++++++++++
14 2 files changed, 133 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index fe2071b7461e..dd287ed1d9b9 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -22,6 +22,8 @@ DIST linux-5.10.97.tar.sign 991 BLAKE2B 85a5a1000aafbdd300593955e887c4d7be5decca
21 DIST linux-5.10.97.tar.xz 120372392 BLAKE2B 95246b084605beb4aceb4f747aa03a935347bc6ebd421853cdb63a1c26355439090532e25c61f73a5c380f03bf6c4ae429eea69afbf1d8696de1bd52bcc63c80 SHA512 c55dd97881ffabeea782a0ac377f38b171629bb75fdba95e91d06fb2567ff59363560cba148009a0b9fe9dcd046bf027e35a8efaf6a4cb60f8fd902cddc750d0
22 DIST linux-5.10.98.tar.sign 991 BLAKE2B e181f7d5c579e9255e4cfd54bbc3d2c4c1c4d8fabcd8c636c8db6f80a143bfc5d1d12e738b239a107de190be1a131c64cd07390dc114dcd3bd33f61b045b2be7 SHA512 fdd9b18c945b7051d35b2ec167bffe9c65153a35590c01ab8d552c026e7c6b8a8e15c8098fe81de2168d1fb9b9c0e4f565758b95bc6dd85e4ca7d578bd7a3bc8
23 DIST linux-5.10.98.tar.xz 120374448 BLAKE2B 6cbacbc7f6cdd6a79b3296a1e67abb75f8bdd1aa78ea418fcfe5b33b9d0bd237c23361d1c2ddcc8d75682c5ea124149e35a47028de4374737ab49be1a97f5402 SHA512 55372bf0c0f2c9f663dd98a9a3ae05fef8f1d342fad780907afe27862295e7d2404d4f94018ddac6b0480387eec2e89f2770ad748b651eccf4dcd37533fadf80
24 +DIST linux-5.10.99.tar.sign 991 BLAKE2B edd66967202c248b88da9e6df7779d613bac1d0e57110e1d7a1180a0b3742d8ec2be3e4772932afb832355737005e0db6d8da3209178902a44c5c3ebef43e936 SHA512 692208f18f7d09b8f44618b48f2d1accc8235385fe514594b985cd18d44894bab083096d241289e151de6ac72bc272bab7b165e0efa37373abd4c022eb2d3299
25 +DIST linux-5.10.99.tar.xz 120370044 BLAKE2B 42ece7878e06868808fe40a93c2c9b7c88f7eac2b09af8732107383a89b97c0c9f7537a71f018597c5bf8d938d273cbaa314fce6a96388a6775d4b29afbaf756 SHA512 6e9339d07bc02d632793baec99cff1a1a91897afbd51c4b0e3ac425cd8ff216f247588bf18cd6851affcff36e623159057fb0797a16fe02db9e545429a2292bc
26 DIST linux-5.15.19.tar.sign 991 BLAKE2B 80e62e341cc1c25f890bba25dfb1872842a9e6652cdbc9c7aeb8f16f9a958afba2299485221669ff710af68bc46dfeb4f9374e216f65712ec2b582fbb62ed3ce SHA512 e870fce5b29371aa8ec2ccffc6041566e0194a0a04c089a26e1b0ab53ade5388cdda82acfe557db1fe5b67b9bad62348acc28e0f29bd23884dc413c46ba8a310
27 DIST linux-5.15.19.tar.xz 126226608 BLAKE2B 80f03833a90fa8dc233ecd6b75824adb5c529518ba47a95a7fc6d6547a5e1772e29ef88691516482f0185c46df26cd78eb3048bc865511e8dbbab661f6b1f851 SHA512 58dcdf71bd8d8dcaf2932b6b86a8421046d0780361ad6c4f2eadf3ce1805f106da894d0a6a62cb0919186a11659d7ba36cbe0e956d5ea7a5419e6f43698248b0
28 DIST linux-5.15.20.tar.sign 991 BLAKE2B 0d0f2a8a97a991af1623a1e3e49fec2974b9b584d32c8853a615aeace79df2f3d53cff74eafe885d0451b374772c2917a11913b00099e6181da7579396df5494 SHA512 25115588128f813a87d30f02fc44d5ab4bfdde1f31c5266f7807d1e8f853d9594c46079b666fd26a63be08465f946e380941a08e780f9f1c2923129cb60c46cd
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.99.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.99.ebuild
31 new file mode 100644
32 index 000000000000..db79c9db5598
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.99.ebuild
35 @@ -0,0 +1,131 @@
36 +# Copyright 2020-2022 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 +BDEPEND="
82 + debug? ( dev-util/pahole )
83 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
84 +PDEPEND="
85 + >=virtual/dist-kernel-${PV}"
86 +
87 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
88 +
89 +src_unpack() {
90 + if use verify-sig; then
91 + einfo "Unpacking linux-${PV}.tar.xz ..."
92 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
93 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
94 + assert "Unpack failed"
95 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
96 + else
97 + default
98 + fi
99 +}
100 +
101 +src_prepare() {
102 + default
103 +
104 + local biendian=false
105 +
106 + # prepare the default config
107 + case ${ARCH} in
108 + amd64)
109 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
110 + ;;
111 + arm)
112 + return
113 + ;;
114 + arm64)
115 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
116 + biendian=true
117 + ;;
118 + hppa)
119 + return
120 + ;;
121 + ppc)
122 + # assume powermac/powerbook defconfig
123 + # we still package.use.force savedconfig
124 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
125 + ;;
126 + ppc64)
127 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
128 + biendian=true
129 + ;;
130 + x86)
131 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
132 + ;;
133 + *)
134 + die "Unsupported arch ${ARCH}"
135 + ;;
136 + esac
137 +
138 + local myversion="-dist"
139 + use hardened && myversion+="-hardened"
140 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
141 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
142 +
143 + local merge_configs=(
144 + "${T}"/version.config
145 + "${dist_conf_path}"/base.config
146 + )
147 + use debug || merge_configs+=(
148 + "${dist_conf_path}"/no-debug.config
149 + )
150 + if use hardened; then
151 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
152 +
153 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
154 +
155 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
156 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
157 + fi
158 + fi
159 +
160 + # this covers ppc64 and aarch64_be only for now
161 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
162 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
163 + fi
164 +
165 + kernel-build_merge_configs "${merge_configs[@]}"
166 +}