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: Thu, 18 Aug 2022 06:18:50
Message-Id: 1660803509.d1f4da33a87c856a107234d0d1d3c659758816ef.mgorny@gentoo
1 commit: d1f4da33a87c856a107234d0d1d3c659758816ef
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Wed Aug 17 16:25:44 2022 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 18 06:18:29 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1f4da33
7
8 sys-kernel/vanilla-kernel: Bump to 5.18.18
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.18.18.ebuild | 134 +++++++++++++++++++++
14 2 files changed, 140 insertions(+)
15
16 diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
17 index d5953cede9c6..c69822beb907 100644
18 --- a/sys-kernel/vanilla-kernel/Manifest
19 +++ b/sys-kernel/vanilla-kernel/Manifest
20 @@ -1,18 +1,22 @@
21 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
22 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
23 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
24 +DIST kernel-aarch64-fedora.config.5.18.18-gentoo 242571 BLAKE2B fdc6876156c2a280d94551e64ba9427f634573390717558326d7afca34b8f5dc331929aa1cd4097d66b3ea916d3dd6c91977b70bbdb259ae4b95139f38f2334e SHA512 33b4ce891feea2dbb76c42a8ec24fcb7082e453e87ec7eafb56763f4778af6e460a9a9e92b18dabcd284741cd0856ffbf8069417a130190a0443e054ab83c76c
25 DIST kernel-aarch64-fedora.config.5.18.9-gentoo 242551 BLAKE2B 6ee62379bf28cc3d77eedeceb8437762e43cde6953828c23554f98b3de3236a808317a268d0885ba92720c59d25f3a1d8cdfda63bc51717f53574d3e7be988c2 SHA512 8aecbf9c1dc43e0c848890ebe38748fb6ccbc61000d5a22a36067d3f7baa9e52faf159c9a071c84195a624303eed6fac468eaeaf633ac25d33290277aaee36e3
26 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
27 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
28 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
29 +DIST kernel-i686-fedora.config.5.18.18-gentoo 221018 BLAKE2B d317cd62903839c19bc8a601c67016b9663ecba640df353a6d161175de84b7154da7cc316c06c7a2765543989933066a26c3b257a1db30a1d726d5a57959bf2b SHA512 4cdfb0a0c9d6c8152f2c7f5aae3aa31bdbcabeaa8d3400d96407fa462ad8d922908520f804cb6db434012a1048e4bfdfe9ea6aa70bf1e456f6137b1a7a99726f
30 DIST kernel-i686-fedora.config.5.18.9-gentoo 220827 BLAKE2B f73a4fb7d46e9275b5a0ab119aa8915cb7897a5652664efbd71596b5b3be6ee4cf9f9c7907ef3fe45ab2a2868512fad7b4b11213534d6260815ca4eca7593ae0 SHA512 afce5864ea980c1a7b53c187b483c6fa8eb88d11af9114d71b6177b4347d534d7f9dd68240c0cbb729e0da3cc01a5783b6e150d94708f1aabaa6c9956bacf06e
31 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
32 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
33 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
34 +DIST kernel-ppc64le-fedora.config.5.18.18-gentoo 211967 BLAKE2B cc39a3fa68e738242f9e49f9d9e5d66cb983a3b8ed9d5575b3b3602c169b41f1c0048bcd02a4e052441bc94ee1679b3e68e0623426dd8de61253fb114b359405 SHA512 ddb1418c1d8d4978aaa29464bbd8925bee847b037b7c96b27ef9c4c70eefd0678800580dcb6db2c64263304541c7ab896b23be9d97f0ff56dcde18d5366d7923
35 DIST kernel-ppc64le-fedora.config.5.18.9-gentoo 211942 BLAKE2B f92e988198b08bd7a30976d92ba152ac2986324c223202dc73bb733c903015095498b529cb5dd3b3d86d678c7ca0adba7f4807e9046b8c8215b2e1ebd06e53d5 SHA512 4f1d85a3f858a6e240e0bc34b37a77f78cf128b19de78404de9f0463d0d3fa6e87b84e5710b7ce501b92e162d798b372fb6843e83b3821a77a73ead2385e9014
36 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
37 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
38 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
39 +DIST kernel-x86_64-fedora.config.5.18.18-gentoo 221988 BLAKE2B 05e85bc4b71b4a904ad248f1c779c666e765d67729e48c590d36247fd62d5a2bf0245731e015eedca809db76d21af41ea409f8566b985892be1681d87738a62e SHA512 8c769c76359a25db5030f6309ec911afc0e50b3a0f8d6886d45993f5dbe3738b262f6ca4275d3bae9ae26d279b94911234d5f6edf4065c9446344e84b17a35a7
40 DIST kernel-x86_64-fedora.config.5.18.9-gentoo 221797 BLAKE2B 1873ffeab78c7e9a8186d255dac5b7dc5fcdadfa97d6a265aaac1583006adc1c0a150eff6892f1a82e622f77122051d0eca5e2cc0d9b95f8d0e36212d6c47ed3 SHA512 7c2325a12de85bc1aa300b5f3846711a20d43817a60a68e7cae84ac6505b3deb158c9dd0871d86e148f46435f36549231566abe276ffc2ee8bb9dd2ac5c40960
41 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
42 DIST linux-5.10.135.tar.sign 993 BLAKE2B a544cdf24ef0f1dc5ddc5622d8f00dc3af0fc38604d955c7a8b54e0c1fa7f7d60197551710cc2ab0bad69fc06d2077e5b1b796259fe29665d558b5fe656beff1 SHA512 ef565e3ae98acf58fa871e701b8a4ad2a3fd1f5aae109685cf1bd5cf0d2fca3f8361ca5d0d14613311a1bfc5069013249ece0f6eec4b88b2c4157caeca0686d6
43 @@ -29,6 +33,8 @@ DIST linux-5.18.16.tar.sign 991 BLAKE2B 5309ae0d80fbec35f4fcdfb82e3f1fd99c96ad53
44 DIST linux-5.18.16.tar.xz 129844784 BLAKE2B 60e9cc780af70242eaf3b41374acd8c11bb388a9aa17341aa98674e31a72cbd1c6ecf80158476fd762ed8955c6ded9a3ce8cd782ce0c956ddc3031c7487da686 SHA512 cc6813dc2c2bf8125159368e7b0b2812be220fd23cea98ec12ca727f3e032d313c80fc103abc55aa879c70105629dc54f14eed8e6fdfe00b9246bb850f86f5bf
45 DIST linux-5.18.17.tar.sign 991 BLAKE2B ec46e8df0d2b2fa10b13a54284f46e058d2bb395599ebcaf5b5071b7ad61ec81673a73da4a5c09bd6603802d53f49b087e843f8b07b3b3529eaf12d3538e8c13 SHA512 053365b23cc7468b96b89ce56a788f6b67257727f35ff851a2a2006b9ff5b606c4d8c007553e0b62bec5989ba67667a3d47a169f4db9ee18cb35b2e5d860b582
46 DIST linux-5.18.17.tar.xz 129891768 BLAKE2B 30af8d2fdc12378a8b4323757a2abee009a548c0b0019d14e38882e768d8f885b710a6f3e3e4eb8da746ce29a94d2f5707ce796fbdecb148dcda0e403fce1192 SHA512 0910f673fd457fece8e19abae6d538c6546463a290faf92e3b51cdfc28d876aff908e0d85bba221eebd4e8de70717a78f7646b16e738d70453583a7f2db8873f
47 +DIST linux-5.18.18.tar.sign 991 BLAKE2B 57ce40770a11f3042213e17b86927a66696152d6162d037f2abaf0d2ec92da123d39a5279c66235547efcf87490e878e105646760e0fb8d3c4781bdbceaf5292 SHA512 454a5abd6b7386787889cd858cc49e2d305de0376e0253abe3a186c59ab10d7d55f593176fa505971d98307c030b5f49ff1a9bebeca81d5698774cdb4330d041
48 +DIST linux-5.18.18.tar.xz 129853768 BLAKE2B 071651dc6e319a2ba7af97be5656e1ffefb1b4203fc164c93dea29929568133bad37c09816210e3c411dacfda153d2fa48d04eac64f16029dac0b481e29d0aef SHA512 4c9d078e00c1463534eff6eed3501c7e11d983844d672b6ac6bdc355a46cad00be5ccd938832f9bd2414b3332984f3753f4cffe7ec4381be804bb593da78cf88
49 DIST linux-5.4.203.tar.sign 991 BLAKE2B 4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4 SHA512 867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f
50 DIST linux-5.4.203.tar.xz 112925472 BLAKE2B 90467bcc6ca564affaa57adb0b0e0f7358dfedcb5d53309b987b239acadf6f9b5c77c4f265c7d5f8e6a6a42e9e5ed5a16cc17baeae004e2b55470c9d786de6ae SHA512 a7c7373cf5abe9ee48920b3f314020c9c552a8cd4e2eff67a32ef2f8300a789e7a7e9b78fd1a57b8a017ccc37a2d970b4abde5a85a7bd01766fc89af64cdbb69
51 DIST linux-5.4.209.tar.sign 991 BLAKE2B e750fa4ffd74c55e555201c23c961bb056171bd009131132868a1d0af0fe878bc798d805461162e40009014661ce91f9da2aee863286bd82b27b359c701e8beb SHA512 6647e67a9515f5ea7cff75fb6e451475ca8115223d73eadd6762fd1874f51834f63d3b03c24895db25da9b635abc583651962bafdec4ba0e2dcf22ccc9609bba
52
53 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.18.ebuild
54 new file mode 100644
55 index 000000000000..f3b1baeee682
56 --- /dev/null
57 +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.18.ebuild
58 @@ -0,0 +1,134 @@
59 +# Copyright 2020-2022 Gentoo Authors
60 +# Distributed under the terms of the GNU General Public License v2
61 +
62 +EAPI=7
63 +
64 +inherit kernel-build toolchain-funcs verify-sig
65 +
66 +MY_P=linux-${PV}
67 +# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
68 +# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
69 +CONFIG_VER=5.18.18-gentoo
70 +GENTOO_CONFIG_VER=g1
71 +
72 +DESCRIPTION="Linux kernel built from vanilla upstream sources"
73 +HOMEPAGE="https://www.kernel.org/"
74 +SRC_URI+="
75 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
76 + https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
77 + -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
78 + verify-sig? (
79 + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
80 + )
81 + amd64? (
82 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
83 + -> kernel-x86_64-fedora.config.${CONFIG_VER}
84 + )
85 + arm64? (
86 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
87 + -> kernel-aarch64-fedora.config.${CONFIG_VER}
88 + )
89 + ppc64? (
90 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
91 + -> kernel-ppc64le-fedora.config.${CONFIG_VER}
92 + )
93 + x86? (
94 + https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
95 + -> kernel-i686-fedora.config.${CONFIG_VER}
96 + )
97 +"
98 +S=${WORKDIR}/${MY_P}
99 +
100 +LICENSE="GPL-2"
101 +KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
102 +IUSE="debug hardened"
103 +REQUIRED_USE="arm? ( savedconfig )"
104 +
105 +BDEPEND="
106 + debug? ( dev-util/pahole )
107 + verify-sig? ( sec-keys/openpgp-keys-kernel )
108 +"
109 +PDEPEND="
110 + >=virtual/dist-kernel-${PV}
111 +"
112 +
113 +VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
114 +
115 +src_unpack() {
116 + if use verify-sig; then
117 + einfo "Unpacking linux-${PV}.tar.xz ..."
118 + verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
119 + < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
120 + assert "Unpack failed"
121 + unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
122 + else
123 + default
124 + fi
125 +}
126 +
127 +src_prepare() {
128 + default
129 +
130 + local biendian=false
131 +
132 + # prepare the default config
133 + case ${ARCH} in
134 + amd64)
135 + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
136 + ;;
137 + arm)
138 + return
139 + ;;
140 + arm64)
141 + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
142 + biendian=true
143 + ;;
144 + hppa)
145 + return
146 + ;;
147 + ppc)
148 + # assume powermac/powerbook defconfig
149 + # we still package.use.force savedconfig
150 + cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
151 + ;;
152 + ppc64)
153 + cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
154 + biendian=true
155 + ;;
156 + x86)
157 + cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
158 + ;;
159 + *)
160 + die "Unsupported arch ${ARCH}"
161 + ;;
162 + esac
163 +
164 + local myversion="-dist"
165 + use hardened && myversion+="-hardened"
166 + echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
167 + local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
168 +
169 + local merge_configs=(
170 + "${T}"/version.config
171 + "${dist_conf_path}"/base.config
172 + )
173 + use debug || merge_configs+=(
174 + "${dist_conf_path}"/no-debug.config
175 + )
176 + if use hardened; then
177 + merge_configs+=( "${dist_conf_path}"/hardened-base.config )
178 +
179 + tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
180 +
181 + if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
182 + merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
183 + fi
184 + fi
185 +
186 + # this covers ppc64 and aarch64_be only for now
187 + if [[ ${biendian} == true && $(tc-endian) == big ]]; then
188 + merge_configs+=( "${dist_conf_path}/big-endian.config" )
189 + fi
190 +
191 + kernel-build_merge_configs "${merge_configs[@]}"
192 +}