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: Mon, 28 Mar 2022 15:52:28
Message-Id: 1648482731.0cc9b884cf8d383b2775af31bf6abf53c94cfcf5.mgorny@gentoo
1 commit: 0cc9b884cf8d383b2775af31bf6abf53c94cfcf5
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Mon Mar 28 12:29:36 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Mon Mar 28 15:52:11 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cc9b884
7
8 sys-kernel/vanilla-kernel: Bump to 5.10.109
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.109.ebuild | 134 +++++++++++++++++++++
14 2 files changed, 136 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 23c38c7d96de..6470a3ecad81 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -23,6 +23,8 @@ DIST linux-5.10.107.tar.sign 993 BLAKE2B f41c5d36a501388b646e217416c6517de0e8b46
21 DIST linux-5.10.107.tar.xz 120367492 BLAKE2B a5c817a5b20216fea7dea4b0e04e7455c65d42f50a17cbffbb64a4f2c84cea01708186686785a968702729c62f487c1633576527c08e9f1a28abbbde2a460360 SHA512 49b03d2f0389a88461939748846a28a271ec28dadf29354f24e3647b4249ee913c18db30754df32af4af19047879778bd9ce2e253137baa71c2b74b3249c168d
22 DIST linux-5.10.108.tar.sign 993 BLAKE2B ad0407df1b2263db1642db6e484dc6da79c742b955ef8795746c408b3ec4375ad4bb499094d11ed0223e37ed5bbe8baad3db561eb882c598b485538518a67db4 SHA512 b1c8e9a5f8f40008dcf67ad34cb67f58c1c1e3f967d0b08a19ca55b8cd5b04ff79938b4a07b911c8ecaac92efe03c42ddd251ecc9e1848644debe86da7778633
23 DIST linux-5.10.108.tar.xz 120387340 BLAKE2B 0507af350fc0379af63aaa528893dc01bd31fac55e9c9c294c3fb5addb08dfb8e486d692e69df774a0c1b961bb1fb82a1d42689cc16d96f84f943c21720c8be1 SHA512 848014233bd8936d22efbd7d25d4ae34988ca5ca97c59d2ffd239ae1670970304e1a75b8c3bc1618ba7933597ca9456cf551e4a9cf858eac8a34c1ed954d4261
24 +DIST linux-5.10.109.tar.sign 993 BLAKE2B e8676c541d825ce58f124da1279b1a2cc12fc5f4c29bfeb2bdfa35a35bca574a247c20905c58ee247b9efaa76abc1b24d80a3d0e9bbf36041adc26e47d111792 SHA512 45642e01921fff411714d6df90190161c5122f5810e136b55357ce3d9364321868e55b3b7c14445b16b1426e81321619aa636cfa501609f23bf9105c661bffdc
25 +DIST linux-5.10.109.tar.xz 120392556 BLAKE2B 3bd903b54977d942cb69d4eabaccaee3d8ce36bb68633715751752920ee87d80a6eb63779bf54809d8579145a769ebe7795881d266d2e22ae8c6c6a132f664b9 SHA512 0a035a72096c6076c47c93c885dbbf0f59315ea7acf1289305a98d6d585d9622115b38fb32634cc72929fd200eb7a4f5debb076c681afec999dbe49ef67438e2
26 DIST linux-5.15.29.tar.sign 991 BLAKE2B 60c8d29495d8a5c30d0c7059b0311c7041da9e456d3de9cb586679722e80b34e7ea563fc8e4f70a3bdd8e1def48e0fff2f92ff1aab805c77a58b1bc19336df04 SHA512 99d73d02a834e11b0e8f9b5423ec78acb07ff772adb22dcdb8801a81c7168d579c2f0bc033ad5ce261c3f7cdf722b8e30f12a8ad7df9a781004b2f9e70ff1f87
27 DIST linux-5.15.29.tar.xz 126248424 BLAKE2B fe712dfbb1a3f3401f1354b8bda0fd502a0eff7333be91780201335b854ec0ea090b60a28d2167797ac705a52c5e78cd9b4c15f6b06cd2a6f87b201894948c33 SHA512 4221722a076580a6cd3526b62d8885a20c2d4de12ac3da47cabb15e5613264735982d372d04eb523b9405fe684b7de2501ac97f98c5b6f1a8f04d93bb4674ba8
28 DIST linux-5.15.30.tar.sign 991 BLAKE2B 07f659fe9acf17e056eb9a2216b98f91f9bd1f3fc9ad0eddd8f261f8b804a164000edbd304931e4ae0f96818ceb6f2748701810a6139dd3e8ef7544e520699eb SHA512 caea373930c565bf6da18c258dacc2d452fe5895d7b3b6cce0e8e0f5c51072412df664c71844e666cf6f2112e45047ab9fee99cb8b65145d3c324659dc379a56
29
30 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.109.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.109.ebuild
31 new file mode 100644
32 index 000000000000..f79327e40cfb
33 --- /dev/null
34 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.109.ebuild
35 @@ -0,0 +1,134 @@
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=g1
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/${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 +"
75 +S=${WORKDIR}/${MY_P}
76 +
77 +LICENSE="GPL-2"
78 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
79 +IUSE="debug hardened"
80 +REQUIRED_USE="arm? ( savedconfig )"
81 +
82 +BDEPEND="
83 + debug? ( dev-util/pahole )
84 + verify-sig? ( sec-keys/openpgp-keys-kernel )
85 +"
86 +PDEPEND="
87 + >=virtual/dist-kernel-${PV}
88 +"
89 +
90 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
91 +
92 +src_unpack() {
93 + if use verify-sig; then
94 + einfo "Unpacking linux-${PV}.tar.xz ..."
95 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
96 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
97 + assert "Unpack failed"
98 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
99 + else
100 + default
101 + fi
102 +}
103 +
104 +src_prepare() {
105 + default
106 +
107 + local biendian=false
108 +
109 + # prepare the default config
110 + case ${ARCH} in
111 + amd64)
112 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
113 + ;;
114 + arm)
115 + return
116 + ;;
117 + arm64)
118 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
119 + biendian=true
120 + ;;
121 + hppa)
122 + return
123 + ;;
124 + ppc)
125 + # assume powermac/powerbook defconfig
126 + # we still package.use.force savedconfig
127 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
128 + ;;
129 + ppc64)
130 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
131 + biendian=true
132 + ;;
133 + x86)
134 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
135 + ;;
136 + *)
137 + die "Unsupported arch ${ARCH}"
138 + ;;
139 + esac
140 +
141 + local myversion="-dist"
142 + use hardened && myversion+="-hardened"
143 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
144 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
145 +
146 + local merge_configs=(
147 + "${T}"/version.config
148 + "${dist_conf_path}"/base.config
149 + )
150 + use debug || merge_configs+=(
151 + "${dist_conf_path}"/no-debug.config
152 + )
153 + if use hardened; then
154 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
155 +
156 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
157 +
158 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
159 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
160 + fi
161 + fi
162 +
163 + # this covers ppc64 and aarch64_be only for now
164 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
165 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
166 + fi
167 +
168 + kernel-build_merge_configs "${merge_configs[@]}"
169 +}