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, 29 Jan 2022 20:43:25
Message-Id: 1643488987.284efccb95643b46bccf766ea850582c3ca5cffc.mgorny@gentoo
1 commit: 284efccb95643b46bccf766ea850582c3ca5cffc
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 29 19:34:34 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 29 20:43:07 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=284efccb
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.95
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.95.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 d23347752ce3..f90f0d9041ff 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -16,6 +16,8 @@ DIST linux-5.10.93.tar.sign 991 BLAKE2B 99714d74793b5012c4e2767d796655002b31098b
21 DIST linux-5.10.93.tar.xz 120342268 BLAKE2B a174f9513127835a0753cde0f26d14a929563f703a8ba2343e1b09dc3089d96b85680c9d7f49e2d3860241ce3e258a0443c861f143813709987378bea6d438ba SHA512 a152188e394258d0694e7e47a05a109068492d985251f468f2b883881f1234f3fb269c9d5935e3299c7cc2bfb66cc7948e5d36f69700049580d4f9cf4ff1cc94
22 DIST linux-5.10.94.tar.sign 991 BLAKE2B a4925ddb6304cb86a84353121989bd4b959bc2c791708cbf5e32b9221b9522f32d5419aa37576853e52e756ab30ecaa01111d62e1fb473bc64ea9be599aa2159 SHA512 26a90fd5d443f0aafa4c7f9452c51d1a95b06dac8b8215da3eb7b4f5f6b65b779503bd1d763b81696c5692cee8c202dec1a96f54a7b40bc815446cf7f4bdc9bf
23 DIST linux-5.10.94.tar.xz 120378928 BLAKE2B 274f1c14cda832d5e24a221c563302c5a5c2411d1411202226bcc92cac7bca537c61c648f675ba1653cd45993e3516bd91506c1b250f42311ee5db55b172705a SHA512 745ac65480ea5524f7e3285c23c56788ba91ea220d63e7e68335c73ccd45759987165bbbb8be6dc6894011ce6300589e482aa9fe43fb0a1073253c537be173f8
24 +DIST linux-5.10.95.tar.sign 991 BLAKE2B 246d285573410c0e7a3ac59481bc603292a6e15d904192d5382c8bb4edb1e336e9128e714ec43a32508dfebaab8fd76290777cb3933f84e93556b73c91f8399d SHA512 baf839a20e5be9270eca1f2e0a02752a694f609d93bb4985b22d32613cfbf1659e35716902fb1aa26a266982388b8168945acdd134891f33b56e08b21c011eb6
25 +DIST linux-5.10.95.tar.xz 120386860 BLAKE2B a9ff30ac71b2255afd674f441be52cdbb4d417046840ea2e751f0906c26f59d23eb1ffea7ce66254835bcbb7db22bb4018f01c2c003d24678435415d8454ddc2 SHA512 4dba546ec60634372bde1b70c1c50e3ba71bd0a73f04012faa8c4b55ddb217c2fed7fafffdfa2cdfd78a1792e3f776583a813e6cd9f16b38fa87a734c8303041
26 DIST linux-5.15.16.tar.sign 991 BLAKE2B 0523e495f73946be58c751189eeac9eeeff5eb9869a9798bc742fcb08359529cc43e2bd991e998cefdc6f4ab3e3e8f8da7a8ee56b25bae266f2f144af236f568 SHA512 7ca0a4db533570a8ea8c12a3ca477adad8be94020da33a6e666676d5dc5a7b7f3e6eab4772a0122d1cf3bda39294f42ed2429798414d41cc5c89ab9ceee8a901
27 DIST linux-5.15.16.tar.xz 126178716 BLAKE2B 73b2f6a135c89db2ffbba8d8271761df3b98e0c844821367a3e009d67a5df27d11f02265eae34229b699c7308d4cf505f0f4a751a8135b6a6f0bf46929cbb785 SHA512 a2e3dbd92b2079a64af4d4a17db998381b5afe41ffb8b6b7fb43a69eb93b1c6d766b4b8ebba287d45f3de8392e4808cca5a7ccd5da5d42f7f58a57bf17ce5d10
28 DIST linux-5.15.17.tar.sign 991 BLAKE2B fc33eb461f03a37408dc5fffa8360da639c0d6e30ecc60eb25879cf8988dd500a76b38e90b880311cfecae150b81491353dcc5da8241e5bbc4e212ab78ef46ca SHA512 e68799de99982a71c8ee92200606ae5072cf58c8980bdcf2637bc75bd612344fdd0c893ffedcdec650d1f3474eda4d8df3083ca27c16124d6d72ee5d00ca0288
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.95.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.95.ebuild
31 new file mode 100644
32 index 000000000000..a462d2e337ec
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.95.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="~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 + 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 +}