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: Wed, 02 Feb 2022 09:27:26
Message-Id: 1643794001.9b0df997f5753ead5c5ed4b8a517428515274139.mgorny@gentoo
1 commit: 9b0df997f5753ead5c5ed4b8a517428515274139
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 07:48:53 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 09:26:41 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b0df997
7
8 sys-kernel/vanilla-kernel: Bump to 5.16.5
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/vanilla-kernel/Manifest | 6 +
13 .../vanilla-kernel/vanilla-kernel-5.16.5.ebuild | 132 +++++++++++++++++++++
14 2 files changed, 138 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index 44e46cac59c8..ff75aa3f9d60 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -2,15 +2,19 @@ DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4
21 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
22 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
23 DIST kernel-aarch64-fedora.config.5.15.14 242650 BLAKE2B b5587c0e365a00a5283ea3a5184b473783ad6296a6516372c6c79305d2837e782d18fae8ed8e852eb6d946d1dac6c6159231f2249f3360dd1651e4f1f06d5694 SHA512 2a8447d8128a881c08745f58704a9fe46fcfd2048c5d5775a518e16b6f5b5603e22bcd4f04c192d541fc83e6253be3b29a5f0f39ddec96c8668bc801d9356a9a
24 +DIST kernel-aarch64-fedora.config.5.16.5 236015 BLAKE2B 785c16d38c4266c55e9d2f2854e4a90095400667c768ae3b142ebad072f7977b7b39732d7eb1361b2f59fdccbed8594170f45bdf092691e0793ad7ede2906220 SHA512 10bcbe257dede6eea0d3ffda57dad25c85444b5569bc9bf48f36fa9445f71abeee853351f6bed0821b68d39aaa418313e39bd37bdc6656bfa041cd95661b9b2d
25 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
26 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
27 DIST kernel-i686-fedora.config.5.15.14 222268 BLAKE2B 96e283052369a936fbe0f415d7176bb922bc0e22925fc25a56e6e0c36a723bf7e9ae29bbc661c0a8a6c44a218482896f25c529f9cf7a0d3bc31de8ea88f50a5a SHA512 b5ec452458b04ab316622239ffd98782a10eab17a02697d15359efdc18dfaf8052a189c66729157d2e9eed20aee25a47fa9b81f1da78d42150f10b0746f57938
28 +DIST kernel-i686-fedora.config.5.16.5 215513 BLAKE2B 3e8fc55a0cbd7de2b1c70d3f5d85f4a7eb77acd6a3f41fb7120ffc8531ce7dfd868f6f8ed9ae0ea8f69c727c7da77c3e68d6245a7edd0b1f9a79f304a2354c95 SHA512 6e49aa3d975982d9a1e476590d9e499c9c798f62713666c034367a256d339c785d89bc2e061495240644ff5aeee34afa71b840cc8f1d8ebfe95142b9ebbfb515
29 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
30 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
31 DIST kernel-ppc64le-fedora.config.5.15.14 213374 BLAKE2B 527fcc240988d111f41a366dcbeb1a04938e8cb1c83406557fd9fefc64677ee7d2539fa21fb78ea66859c428870fd54b1d3827deafec17569cdba9991913c960 SHA512 9db1d852c9385a5771cf9992b1b3ba34a44d95abdee929ae85b6e6ff8baf6b1c7a4a6c4b2446ae7ce7d1bb59b4b915d5793b505e21d643e24dcb408afd60457e
32 +DIST kernel-ppc64le-fedora.config.5.16.5 207101 BLAKE2B 3ef46342a647e06d96597db46a59bd953987eb9604bb5084758783191be3e0ced9ba3b81c16d3bbe373cc9c8ce7ba3f49c16f24b128d89415ca489273206cc31 SHA512 4c108c67d2f2afbca0fcd53ca6a09da5f79cbab21fb64704a47f7e112e9ba00b1071bd1aee8f4ea0790c15a2ca8e2a464007ff2eb0769ab2b59b1e0664f37071
33 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
34 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
35 DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 7605b06ba48c40841927a4f384d6b078b9b333ea5fb4b2cfee68a7ac9510daecd6e9e3555badae23f93b072a8d08b9503ef110dfbe35ebb058cd9a0c57437310 SHA512 e5ef924333714165d0afe5c33720920bf277ca341e939a99bc058f9ea52377a583fdd7aeb45a4060c6426c240fbeb9a6b80fc3dad19c75b112b507bd65369c98
36 +DIST kernel-x86_64-fedora.config.5.16.5 216440 BLAKE2B e79c8445467b70937c4a0b44f9d9488a264603335b93711ab52cd9499523fc4fc90c9f1e1acfc3a4da3f5e7a1a35ff36fb33411e600199940a8f8ed32e962a4c SHA512 2ab3e7cb9999db8fe015b21d7f6c7b1f0647b8657f09e8b256c9164ed778d5fec5aff48c9b9048f100adc4e17d078e89318126c417fe34142201ee8f6a03837a
37 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
38 DIST linux-5.10.93.tar.sign 991 BLAKE2B 99714d74793b5012c4e2767d796655002b31098b5e7c3c06c125030496f6586955b08fcfcf2ed58219a7e2862eaf25f44a751fd9baf42f60874acb775fe669c0 SHA512 cd29eaac1f172913ed47e45741cfd246b23fcf21613a842d617261a3eeaf57f05fac9402e85c0e69eb42bd091ec795c2b2892adc79a63de49c8cd9bbe8dc7c6a
39 DIST linux-5.10.93.tar.xz 120342268 BLAKE2B a174f9513127835a0753cde0f26d14a929563f703a8ba2343e1b09dc3089d96b85680c9d7f49e2d3860241ce3e258a0443c861f143813709987378bea6d438ba SHA512 a152188e394258d0694e7e47a05a109068492d985251f468f2b883881f1234f3fb269c9d5935e3299c7cc2bfb66cc7948e5d36f69700049580d4f9cf4ff1cc94
40 @@ -28,6 +32,8 @@ DIST linux-5.15.18.tar.sign 991 BLAKE2B aca59944c1898d3e8267f776d3c2a748a8efeeee
41 DIST linux-5.15.18.tar.xz 126228144 BLAKE2B 94190ec4dc73c52b736a081a097453c29e1f1b86d6536a2a4393d8fd219da9b81f5667f3cc0e9eb2290de88ee1b14c7685ecdb162ee389a7dbf1c081a97abc9a SHA512 f3927c06ae1b603191fbb2153837c9b45cfbff291121df7e01af3c139116301af2d530ced01b1144b1ec3c317f156d996d98da84bb53069fd736e2c33ebd7678
42 DIST linux-5.15.19.tar.sign 991 BLAKE2B 80e62e341cc1c25f890bba25dfb1872842a9e6652cdbc9c7aeb8f16f9a958afba2299485221669ff710af68bc46dfeb4f9374e216f65712ec2b582fbb62ed3ce SHA512 e870fce5b29371aa8ec2ccffc6041566e0194a0a04c089a26e1b0ab53ade5388cdda82acfe557db1fe5b67b9bad62348acc28e0f29bd23884dc413c46ba8a310
43 DIST linux-5.15.19.tar.xz 126226608 BLAKE2B 80f03833a90fa8dc233ecd6b75824adb5c529518ba47a95a7fc6d6547a5e1772e29ef88691516482f0185c46df26cd78eb3048bc865511e8dbbab661f6b1f851 SHA512 58dcdf71bd8d8dcaf2932b6b86a8421046d0780361ad6c4f2eadf3ce1805f106da894d0a6a62cb0919186a11659d7ba36cbe0e956d5ea7a5419e6f43698248b0
44 +DIST linux-5.16.5.tar.sign 989 BLAKE2B a55d8da745785fb479519fd9daf745bae4be54e2b8c135b9f51af38035b273de86bc54dbb7598f98d3bebad995889a779bd88f9d65b2ade44d9bc995ba5ab2a6 SHA512 414f71b299c7624604d1e4b5cc894c888cefded016249d2cefda54727e043152a6abf1a62daccd4934348965c4a574ecad6b098d38774b114098a6d74d9f6921
45 +DIST linux-5.16.5.tar.xz 127552076 BLAKE2B 9eccc20c59a93aa21349ce99b88638de8bb0589037e91143d23932cb5312878bac7ae95adfd0f95b79ad0085f74109577427675320e4a2548f8762661dcdc8e4 SHA512 bb87573623a275a8860728e9586f0e63aba7bd868de55ce27871f615e9b174aeb18c3faefc41e3d656bc998768fa3e3c6097e9d39c32fea48d3769f46c48a2f2
46 DIST linux-5.4.173.tar.sign 991 BLAKE2B c4a1ea4cb4dc7e4654fd5b2405fb1fecfaa0421d778b056c5c9a64a37931e7019f25e7f27c50a74af90dc49f295c9ec63c589a4a80c27b0eccd2920b6ccb7867 SHA512 92f822a73d3f9e62dc5c79f97407ec127e1844cb5fbfb087ae803ddcecfa377daada2bf866aa104a405c3883b055f70020922b90aa1f8cbb4600e56e00504159
47 DIST linux-5.4.173.tar.xz 112885592 BLAKE2B 1c1511e730e42d80b7e6ef2f48ff9c990285f3e05cc18876b6c4901979ff85940283354c84db5dcad81a52efc7c516040243b03d9692291e1a6c3b48059079da SHA512 9ca63cd8e68df9556a7126a535337205f6cc3e83f79908d6805287e44565f7638683b969d2d40a2badba0d18547712b675fa42a64236d3d24c4fb142175e0a2c
48 DIST linux-5.4.174.tar.sign 991 BLAKE2B 3a76dfaac9eccb8e1d7d6e494796c103457c0ab196f0e6ba77fd7b89c75a505522599e86d68e55eec5a2e8aac2715bf9c3f0c211642b65446915c3c5dfdbd35a SHA512 e99359a4beef8ec531378d7a0b397fdd887a96938757661280ab60041bfb27ea09414de176c958860f502f5ecfce4fae57d457bfd9c990b2f361ddac3d7c47c5
49
50 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.5.ebuild
51 new file mode 100644
52 index 000000000000..d3e927d16582
53 --- /dev/null
54 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.16.5.ebuild
55 @@ -0,0 +1,132 @@
56 +# Copyright 2020-2022 Gentoo Authors
57 +# Distributed under the terms of the GNU General Public License v2
58 +
59 +EAPI=7
60 +
61 +inherit kernel-build toolchain-funcs verify-sig
62 +
63 +MY_P=linux-${PV}
64 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
65 +CONFIG_VER=5.16.5
66 +CONFIG_HASH=07359bfbe209ebc2bf6ff2f7b52eb69cc36e21fb
67 +GENTOO_CONFIG_VER=5.15.5
68 +
69 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
70 +HOMEPAGE="https://www.kernel.org/"
71 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
72 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
73 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
74 + verify-sig? (
75 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
76 + )
77 + amd64? (
78 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
79 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
80 + )
81 + arm64? (
82 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
83 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
84 + )
85 + ppc64? (
86 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
87 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
88 + )
89 + x86? (
90 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
91 + -> kernel-i686-fedora.config.${CONFIG_VER}
92 + )"
93 +S=${WORKDIR}/${MY_P}
94 +
95 +LICENSE="GPL-2"
96 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
97 +IUSE="debug hardened"
98 +REQUIRED_USE="arm? ( savedconfig )"
99 +
100 +RDEPEND="
101 + !sys-kernel/vanilla-kernel-bin:${SLOT}"
102 +BDEPEND="
103 + debug? ( dev-util/pahole )
104 + verify-sig? ( sec-keys/openpgp-keys-kernel )"
105 +PDEPEND="
106 + >=virtual/dist-kernel-${PV}"
107 +
108 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
109 +
110 +src_unpack() {
111 + if use verify-sig; then
112 + einfo "Unpacking linux-${PV}.tar.xz ..."
113 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
114 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
115 + assert "Unpack failed"
116 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
117 + else
118 + default
119 + fi
120 +}
121 +
122 +src_prepare() {
123 + default
124 +
125 + local biendian=false
126 +
127 + # prepare the default config
128 + case ${ARCH} in
129 + amd64)
130 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
131 + ;;
132 + arm)
133 + return
134 + ;;
135 + arm64)
136 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
137 + biendian=true
138 + ;;
139 + hppa)
140 + return
141 + ;;
142 + ppc)
143 + # assume powermac/powerbook defconfig
144 + # we still package.use.force savedconfig
145 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
146 + ;;
147 + ppc64)
148 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
149 + biendian=true
150 + ;;
151 + x86)
152 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
153 + ;;
154 + *)
155 + die "Unsupported arch ${ARCH}"
156 + ;;
157 + esac
158 +
159 + local myversion="-dist"
160 + use hardened && myversion+="-hardened"
161 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
162 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
163 +
164 + local merge_configs=(
165 + "${T}"/version.config
166 + "${dist_conf_path}"/base.config
167 + )
168 + use debug || merge_configs+=(
169 + "${dist_conf_path}"/no-debug.config
170 + )
171 + if use hardened; then
172 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
173 +
174 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
175 +
176 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
177 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
178 + fi
179 + fi
180 +
181 + # this covers ppc64 and aarch64_be only for now
182 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
183 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
184 + fi
185 +
186 + kernel-build_merge_configs "${merge_configs[@]}"
187 +}