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: Sat, 05 Feb 2022 22:17:54
Message-Id: 1644099460.d3bfb61d62f276e43af7568035051d2e65436a22.mgorny@gentoo
1 commit: d3bfb61d62f276e43af7568035051d2e65436a22
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 5 19:40:57 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 5 22:17:40 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3bfb61d
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.98
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.98.ebuild | 133 +++++++++++++++++++++
14 2 files changed, 135 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 024df0158d80..caa4be862108 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -20,6 +20,8 @@ DIST linux-5.10.96.tar.sign 991 BLAKE2B f831c2a0879f1e0fe6e157cbaaeacd654d594de5
21 DIST linux-5.10.96.tar.xz 120375044 BLAKE2B 71c2a44c7a170532b787e5c60496a41d5173e7d34e0f5d60808e450f9e91204c52e2dcfce4e63eca44383ebd42cc2ab1021b7f110db03fa5d5f7596c9e53bb60 SHA512 c852b38613dd8dbcf2638854d0f953655a7c720d9a3bf4774cde61609040214358ce9f67ad94fac117f1815b4adc9ed8dd7423388c29acdc2a675b06219499ac
22 DIST linux-5.10.97.tar.sign 991 BLAKE2B 85a5a1000aafbdd300593955e887c4d7be5decca4b09d4f722e4330d2d1b2fb6fd54dc65c4bdcdb992d538ab372aa5ab3b23ce88ae462197d4ff4710d3ecfadc SHA512 af193c493ff7438d856b70474157425e63e4a693e36d924058556460de7218391d31e2b490a2a6df5314ab5612ff839c2d39359aee79b4e3bb42459410ea943b
23 DIST linux-5.10.97.tar.xz 120372392 BLAKE2B 95246b084605beb4aceb4f747aa03a935347bc6ebd421853cdb63a1c26355439090532e25c61f73a5c380f03bf6c4ae429eea69afbf1d8696de1bd52bcc63c80 SHA512 c55dd97881ffabeea782a0ac377f38b171629bb75fdba95e91d06fb2567ff59363560cba148009a0b9fe9dcd046bf027e35a8efaf6a4cb60f8fd902cddc750d0
24 +DIST linux-5.10.98.tar.sign 991 BLAKE2B e181f7d5c579e9255e4cfd54bbc3d2c4c1c4d8fabcd8c636c8db6f80a143bfc5d1d12e738b239a107de190be1a131c64cd07390dc114dcd3bd33f61b045b2be7 SHA512 fdd9b18c945b7051d35b2ec167bffe9c65153a35590c01ab8d552c026e7c6b8a8e15c8098fe81de2168d1fb9b9c0e4f565758b95bc6dd85e4ca7d578bd7a3bc8
25 +DIST linux-5.10.98.tar.xz 120374448 BLAKE2B 6cbacbc7f6cdd6a79b3296a1e67abb75f8bdd1aa78ea418fcfe5b33b9d0bd237c23361d1c2ddcc8d75682c5ea124149e35a47028de4374737ab49be1a97f5402 SHA512 55372bf0c0f2c9f663dd98a9a3ae05fef8f1d342fad780907afe27862295e7d2404d4f94018ddac6b0480387eec2e89f2770ad748b651eccf4dcd37533fadf80
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.98.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.98.ebuild
31 new file mode 100644
32 index 000000000000..3224bff15b58
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.98.ebuild
35 @@ -0,0 +1,133 @@
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="~arm64"
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 + hppa)
121 + return
122 + ;;
123 + ppc)
124 + # assume powermac/powerbook defconfig
125 + # we still package.use.force savedconfig
126 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
127 + ;;
128 + ppc64)
129 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
130 + biendian=true
131 + ;;
132 + x86)
133 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
134 + ;;
135 + *)
136 + die "Unsupported arch ${ARCH}"
137 + ;;
138 + esac
139 +
140 + local myversion="-dist"
141 + use hardened && myversion+="-hardened"
142 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
143 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
144 +
145 + local merge_configs=(
146 + "${T}"/version.config
147 + "${dist_conf_path}"/base.config
148 + )
149 + use debug || merge_configs+=(
150 + "${dist_conf_path}"/no-debug.config
151 + )
152 + if use hardened; then
153 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
154 +
155 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
156 +
157 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
158 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
159 + fi
160 + fi
161 +
162 + # this covers ppc64 and aarch64_be only for now
163 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
164 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
165 + fi
166 +
167 + kernel-build_merge_configs "${merge_configs[@]}"
168 +}