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/gentoo-kernel/
Date: Wed, 02 Feb 2022 09:27:27
Message-Id: 1643794002.955d20458914238e4db3ffce42422cf93943e469.mgorny@gentoo
1 commit: 955d20458914238e4db3ffce42422cf93943e469
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 2 07:49:34 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 2 09:26:42 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=955d2045
7
8 sys-kernel/gentoo-kernel: Bump to 5.16.5
9
10 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
11
12 sys-kernel/gentoo-kernel/Manifest | 7 ++
13 .../gentoo-kernel/gentoo-kernel-5.16.5.ebuild | 126 +++++++++++++++++++++
14 2 files changed, 133 insertions(+)
15
16 diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
17 index fae38576c49c..0ff9ba5f8f34 100644
18 --- a/sys-kernel/gentoo-kernel/Manifest
19 +++ b/sys-kernel/gentoo-kernel/Manifest
20 @@ -14,6 +14,8 @@ DIST genpatches-5.15-20.base.tar.xz 934800 BLAKE2B 6134e0fb2d9810d96809e5f099436
21 DIST genpatches-5.15-20.extras.tar.xz 3852 BLAKE2B 277432195bcb89cffe0fcb0ab0b2f00b889fa7c39c6178d81eb7426405f1bf5b85bc2d6bf5a69e6a0e2c18431eb768d3cae116fd8523de25f720479cc860d6d6 SHA512 e565d94865328b2296fbab040a7bb70444410d478a0b361c1b3502a0d8263ee868fbb446adb5f680716bbd189ecb42519c63849d92690c7e504975a5ff43ffe5
22 DIST genpatches-5.15-21.base.tar.xz 979868 BLAKE2B 217af3325d15020a43cc661746272b7756aa030d7e4e66d014f68e421b83f20fd6ad16cc036cf676b3719c118d4532b174a9f7b05aad730f22a13803fd621702 SHA512 5946fa7783d48d25b4f350815e645078e1629d3678aab048de1ec5c62066180de8db940b1b0e8db2062838fc2e06820a354278c20f60ec8da71f2ea686255c58
23 DIST genpatches-5.15-21.extras.tar.xz 3876 BLAKE2B 4c07b166a474bc11502de000f1bb00d8f0c25914a7877b2a94db844c694e0e7a4c757e8a10880eff40438b97214326ba50e716070d79ce1ef7f68c65d876da39 SHA512 384a2111655d8fd78a2f6165e99be0c74b36cf90333a465a4bb4cb6cda5ba32e1d435958987094a2d1407f02df7331ff2bd4fccace4f0a6ebe0c300692598f41
24 +DIST genpatches-5.16-6.base.tar.xz 410464 BLAKE2B 19e5c3718dc8bd9b10f42b4448da16717f95da8a5ca33145bec2703c850ecfe4978144530823319bce945287642a44d368eef24448b45b12d28f5fe450325e99 SHA512 80c38fece09b566dbb65b02beeba3b895c41f18fec08ab9b09a6200450a88be8fb10c04dd80c88dadb13e3aff56f2e5983063cd2d852d9f1fd7ed92113e74887
25 +DIST genpatches-5.16-6.extras.tar.xz 3800 BLAKE2B 43e9801bfd91b817bc56eeeecf9a86c77ef00c3899a13d78b022dc119c4130d2635fb801b1e638877b68bb17c2ce57edea5d14f8a93acc165c715dc0f5615173 SHA512 cb4570ee5ff2dee8a8e992c7f9d173e4b4c7a680cc8225a53ed9e16887d7ceee3ca7a461aed80bbdbd90dc236b26b1094ee6be207afe1bd15117dbb4025b9c9f
26 DIST genpatches-5.4-177.base.tar.xz 4317444 BLAKE2B e7ad5f0a561dc50a11aa3720c3096230d8209c58a523da7f6f0fb1b0c8ed903780d74c48edc2791f8d8ba7fdc946ef0fc506d73ff3f86e9e2bfb4c05609d4456 SHA512 0e04707f1f5e85b53f425d54c74d9483d33280769d1cdd5122e34d19dfea1fcf0cf258d84579f3f169a1f620d9107a7d454970da313806c5edbad8a6d8632c9d
27 DIST genpatches-5.4-177.extras.tar.xz 1784 BLAKE2B e840ca0c6b2dd9399ff4f0d03e828bbb42f53528e1c13b2825c5439cbccdc36577f029caccf91690857cd6e4901cebd98cc27e2ad2d0644c7503822563f38d0c SHA512 a17abf06bb76236986b9a86f671dc60544b39fc47736aca69359e6d68699a52a3e72b1a2ebd57f78602114e9d1f5a201f37121bd6917f50c9d06e385b194cb20
28 DIST genpatches-5.4-178.base.tar.xz 4382260 BLAKE2B f43573bed5925ddad264a150c6bf7e769771cbb89ec56c0c07f73375c19386ebd15b538b12b89c9e18ad3592b1be038288f8bc4e8ee4365fe92c118d81e3a5a7 SHA512 26fec31e23bb0758ec4a5c5542868795172d7717dcb1323cb9a930cb9b60c860cd033836d9ef80ab327a85656f4a70a46a597ffdb8e9ad27f7431d1bd1944b31
29 @@ -26,16 +28,21 @@ DIST gentoo-kernel-config-5.15.5.tar.gz 4128 BLAKE2B e30fff372b0112cc05723463cb4
30 DIST gentoo-kernel-config-5.4.114.tar.gz 1298 BLAKE2B e494041cd63ba53f055cfd555e359934d5054238bd096addd7965754e6708bada63398c4b315318f73130ed81c1391524388396775632248870721f1ce23f203 SHA512 225600db53532ee131dd83d10cecc97a83f4615975ff32f3f6190a15eace64707cb59490bb42940e4429f9054221b9d9a589ada443922062bb5ee18ecc42c26c
31 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
32 DIST kernel-aarch64-fedora.config.5.15.14 242650 BLAKE2B b5587c0e365a00a5283ea3a5184b473783ad6296a6516372c6c79305d2837e782d18fae8ed8e852eb6d946d1dac6c6159231f2249f3360dd1651e4f1f06d5694 SHA512 2a8447d8128a881c08745f58704a9fe46fcfd2048c5d5775a518e16b6f5b5603e22bcd4f04c192d541fc83e6253be3b29a5f0f39ddec96c8668bc801d9356a9a
33 +DIST kernel-aarch64-fedora.config.5.16.5 236015 BLAKE2B 785c16d38c4266c55e9d2f2854e4a90095400667c768ae3b142ebad072f7977b7b39732d7eb1361b2f59fdccbed8594170f45bdf092691e0793ad7ede2906220 SHA512 10bcbe257dede6eea0d3ffda57dad25c85444b5569bc9bf48f36fa9445f71abeee853351f6bed0821b68d39aaa418313e39bd37bdc6656bfa041cd95661b9b2d
34 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
35 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
36 DIST kernel-i686-fedora.config.5.15.14 222268 BLAKE2B 96e283052369a936fbe0f415d7176bb922bc0e22925fc25a56e6e0c36a723bf7e9ae29bbc661c0a8a6c44a218482896f25c529f9cf7a0d3bc31de8ea88f50a5a SHA512 b5ec452458b04ab316622239ffd98782a10eab17a02697d15359efdc18dfaf8052a189c66729157d2e9eed20aee25a47fa9b81f1da78d42150f10b0746f57938
37 +DIST kernel-i686-fedora.config.5.16.5 215513 BLAKE2B 3e8fc55a0cbd7de2b1c70d3f5d85f4a7eb77acd6a3f41fb7120ffc8531ce7dfd868f6f8ed9ae0ea8f69c727c7da77c3e68d6245a7edd0b1f9a79f304a2354c95 SHA512 6e49aa3d975982d9a1e476590d9e499c9c798f62713666c034367a256d339c785d89bc2e061495240644ff5aeee34afa71b840cc8f1d8ebfe95142b9ebbfb515
38 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
39 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
40 DIST kernel-ppc64le-fedora.config.5.15.14 213374 BLAKE2B 527fcc240988d111f41a366dcbeb1a04938e8cb1c83406557fd9fefc64677ee7d2539fa21fb78ea66859c428870fd54b1d3827deafec17569cdba9991913c960 SHA512 9db1d852c9385a5771cf9992b1b3ba34a44d95abdee929ae85b6e6ff8baf6b1c7a4a6c4b2446ae7ce7d1bb59b4b915d5793b505e21d643e24dcb408afd60457e
41 +DIST kernel-ppc64le-fedora.config.5.16.5 207101 BLAKE2B 3ef46342a647e06d96597db46a59bd953987eb9604bb5084758783191be3e0ced9ba3b81c16d3bbe373cc9c8ce7ba3f49c16f24b128d89415ca489273206cc31 SHA512 4c108c67d2f2afbca0fcd53ca6a09da5f79cbab21fb64704a47f7e112e9ba00b1071bd1aee8f4ea0790c15a2ca8e2a464007ff2eb0769ab2b59b1e0664f37071
42 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
43 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
44 DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 7605b06ba48c40841927a4f384d6b078b9b333ea5fb4b2cfee68a7ac9510daecd6e9e3555badae23f93b072a8d08b9503ef110dfbe35ebb058cd9a0c57437310 SHA512 e5ef924333714165d0afe5c33720920bf277ca341e939a99bc058f9ea52377a583fdd7aeb45a4060c6426c240fbeb9a6b80fc3dad19c75b112b507bd65369c98
45 +DIST kernel-x86_64-fedora.config.5.16.5 216440 BLAKE2B e79c8445467b70937c4a0b44f9d9488a264603335b93711ab52cd9499523fc4fc90c9f1e1acfc3a4da3f5e7a1a35ff36fb33411e600199940a8f8ed32e962a4c SHA512 2ab3e7cb9999db8fe015b21d7f6c7b1f0647b8657f09e8b256c9164ed778d5fec5aff48c9b9048f100adc4e17d078e89318126c417fe34142201ee8f6a03837a
46 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
47 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
48 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
49 +DIST linux-5.16.tar.xz 123114100 BLAKE2B 07a90cc640ff89e1359c06cee8c38abd33e51f9b9a89833e31a1d2750526fda4a59e8884db3c1ea63df0a37f0d3de6b5a922b014b7313d8abce20d90ac08adcb SHA512 7a257dd576bc8493595ec7d6f3c9cb6e22c772a8b2dbe735d2485c4f5c56e26a08695546e7e0f1f1cd04a533f25e829361958d4da0b98bf0ba8094dd57a85aaf
50 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
51
52 diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.5.ebuild
53 new file mode 100644
54 index 000000000000..8cb5db5233d1
55 --- /dev/null
56 +++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.16.5.ebuild
57 @@ -0,0 +1,126 @@
58 +# Copyright 2020-2022 Gentoo Authors
59 +# Distributed under the terms of the GNU General Public License v2
60 +
61 +EAPI=7
62 +
63 +inherit kernel-build toolchain-funcs
64 +
65 +MY_P=linux-${PV%.*}
66 +GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
67 +CONFIG_VER=5.16.5
68 +CONFIG_HASH=07359bfbe209ebc2bf6ff2f7b52eb69cc36e21fb
69 +GENTOO_CONFIG_VER=5.15.5
70 +
71 +DESCRIPTION="Linux kernel built with Gentoo patches"
72 +HOMEPAGE="https://www.kernel.org/"
73 +SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
74 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
75 + https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
76 + https://github.com/mgorny/gentoo-kernel-config/archive/v${GENTOO_CONFIG_VER}.tar.gz
77 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
78 + amd64? (
79 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
80 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
81 + )
82 + arm64? (
83 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
84 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
85 + )
86 + ppc64? (
87 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
88 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
89 + )
90 + x86? (
91 + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
92 + -> kernel-i686-fedora.config.${CONFIG_VER}
93 + )"
94 +S=${WORKDIR}/${MY_P}
95 +
96 +LICENSE="GPL-2"
97 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
98 +IUSE="debug hardened"
99 +REQUIRED_USE="arm? ( savedconfig )"
100 +
101 +RDEPEND="
102 + !sys-kernel/gentoo-kernel-bin:${SLOT}"
103 +BDEPEND="
104 + debug? ( dev-util/pahole )"
105 +PDEPEND="
106 + >=virtual/dist-kernel-${PV}"
107 +
108 +QA_FLAGS_IGNORED="
109 + usr/src/linux-.*/scripts/gcc-plugins/.*.so
110 + usr/src/linux-.*/vmlinux
111 + usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
112 +"
113 +
114 +src_prepare() {
115 + local PATCHES=(
116 + # meh, genpatches have no directory
117 + "${WORKDIR}"/*.patch
118 + )
119 + default
120 +
121 + local biendian=false
122 +
123 + # prepare the default config
124 + case ${ARCH} in
125 + amd64)
126 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
127 + ;;
128 + arm)
129 + return
130 + ;;
131 + arm64)
132 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
133 + biendian=true
134 + ;;
135 + hppa)
136 + return
137 + ;;
138 + ppc)
139 + # assume powermac/powerbook defconfig
140 + # we still package.use.force savedconfig
141 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
142 + ;;
143 + ppc64)
144 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
145 + biendian=true
146 + ;;
147 + x86)
148 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
149 + ;;
150 + *)
151 + die "Unsupported arch ${ARCH}"
152 + ;;
153 + esac
154 +
155 + local myversion="-gentoo-dist"
156 + use hardened && myversion+="-hardened"
157 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
158 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
159 +
160 + local merge_configs=(
161 + "${T}"/version.config
162 + "${dist_conf_path}"/base.config
163 + )
164 + use debug || merge_configs+=(
165 + "${dist_conf_path}"/no-debug.config
166 + )
167 + if use hardened; then
168 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
169 +
170 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
171 +
172 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
173 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
174 + fi
175 + fi
176 +
177 + # this covers ppc64 and aarch64_be only for now
178 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
179 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
180 + fi
181 +
182 + kernel-build_merge_configs "${merge_configs[@]}"
183 +}