commit:     73899b7e643aa0bf1f28922e4f3e32af2685a906
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon May 16 01:10:03 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon May 16 19:54:18 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73899b7e

sys-kernel/vanilla-kernel: Bump to 5.4.194

Signed-off-by: Sam James <sam <AT> gentoo.org>

 sys-kernel/vanilla-kernel/Manifest                 |  19 +---
 .../vanilla-kernel/vanilla-kernel-5.4.194.ebuild   | 108 +++++++++++++++++++++
 2 files changed, 110 insertions(+), 17 deletions(-)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 1a6522f67d75..07092b28cd10 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,31 +1,16 @@
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 
44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588
 SHA512 
3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B 
a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d
 SHA512 
7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 
94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1
 SHA512 
fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
-DIST kernel-aarch64-fedora.config.5.17.3-gentoo 238977 BLAKE2B 
5f3a43fff7ddfe4dda03f00e7f4af761ff978bbc9c6d2fa73b605f60755a0d40e494428725a7728f5e2f5f58c9931d8d60b048d318e22c635588e546209dcfb2
 SHA512 
4c22514ec7d2d4ce87087aeae17a5f68efc3e70f48298895262d5dbc47623de6ada4254ee3a7f06a302d37af73d921470903f2f3a86fe5224e638bda882be7e5
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 
578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09
 SHA512 
66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 
92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b
 SHA512 
69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 
9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617
 SHA512 
49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
-DIST kernel-i686-fedora.config.5.17.3-gentoo 218090 BLAKE2B 
1d972e6ed16c7dc1dd9959ae406af52d1cdc15f85f8ab376e4d7abb79d9e284a9a68442bde975f5f1a9bc64fffdaee96d1f41392238538b37f1b6f9652ecfcd6
 SHA512 
2c32cca1f20cf54f3e9b394f6e3f14f435bdd72fa22868416129bfd4253a3cc8f3164b6868e31292c2404a1c433944783279e03b45cce9bec3b2813cb4675b27
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 
185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0
 SHA512 
6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 
889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9
 SHA512 
3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B 
db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d
 SHA512 
b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
-DIST kernel-ppc64le-fedora.config.5.17.3-gentoo 209239 BLAKE2B 
7c6fd8bdbd8331def5bb658359aeb3d52a9f0e72d9312699e00d852b6740250edb1c7a77ea76521b0be6a8ce41888aea4ce8734bb267cc1f3e216f2cbd6ab8d6
 SHA512 
f25199dd6cef4be45049fa7d6cc1dc1b8a93ddfeb3b3824e6ead76443c1ea30e31dfcd4ba66625eec74ed43ab255d1e21cb2a9011160cdc64f30c4b1fdcdb9b3
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B 
b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6
 SHA512 
82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 
0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c
 SHA512 
b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 
239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf
 SHA512 
9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.17.3-gentoo 219028 BLAKE2B 
a8a3e2f31315d6aaf19c6771db94a3549379fd48a33b29b00d0311a36325ba8e9f124b5962a447aa8bf63b01f714298f4fca7ff071db165f183ce9023e2b4cf2
 SHA512 
8c7937310b8e9cbaefe4d6910595df373edfea5a56e439671583c98a752eb5d9029bcb32178ea6b09e6847e55e71dd9ab94e0adb149626ce04c8a9e8f6d7a145
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.113.tar.sign 993 BLAKE2B 
076662f2ab09e172f5aef9817beda56753a35c0d48f12d3d096871dca8af6b85f635c1de6d562be0719b475ae66074b659f7a855825c09889bc18d5f9b659784
 SHA512 
c82e59dcb47cc8acf4d08e148ba91bebdf4e4c35a4ec5405ec5401165583d4c509fa287817cc343345da8f24a4cf7ec7e0b8277653f6d230c81beb32eca75fc3
-DIST linux-5.10.113.tar.xz 120410360 BLAKE2B 
bfd4cac707bc8232767aafc0e666ed9fe23951802b87998aded0197a2141d2db20d33f8961e4e03159fd4c397466049ebaa9d47f1f7c512a42739b07e6c899a7
 SHA512 
7099c83243f707d66ac09bf7215aa3fbc63957c2636fa63f287e526de210952c4106de411201e2ac001aa46c73c05cd4892e633911cfa30b96db7613f832b81f
-DIST linux-5.10.115.tar.sign 993 BLAKE2B 
a9a276dba44fc0c663c812d3ba96e8bb0c1849d8dac8c65dea9559ec3064c4fffb9b7a29a90ef663a76ba14f987ca8130b26ddc0c0b3c529809b341c37d41e2e
 SHA512 
a51ce18ca8f33cffcb4aa73b0d92a03ed11b310b0266338a0a07e371dcfb2fbbb340b7829f960c17e9cbeb4b5f9ca6f1139b9b64f2671e9a4fc6c795b3977ff2
-DIST linux-5.10.115.tar.xz 120399008 BLAKE2B 
95a5354c70d75c92fdaaeb70ac6fea360b0dfe5dbdc8574bceac30a07fa0c93d066528f97e40cbcf375923f526d4ab592d9e1c4a06120c5aaee2595a1e1d50df
 SHA512 
787c1fb601a05f7f0d0f235b703a9dd5f6b8f49bbc4bf4ffb8a46fd96d53a96cf2d508d7e575b3d7a8445118730f99516a250e706803b0271215af9a1c058dea
-DIST linux-5.15.37.tar.sign 991 BLAKE2B 
224f222dda3d7221a32b575ae52fe0ea36cf5315860ede2bf8b16ff3e9ab6c03f05fc5604c99da9abe44ebb9af0726731449c7d827dbc29bba5c9af81088108a
 SHA512 
cb775ec01ee9d1de53a0b958c804f8bf7d84185438e4a63e94b805dc0dbdababf0ec85489b8314303a78386090afee30525b9993dc669334dc131b65ead7305c
-DIST linux-5.15.37.tar.xz 126314716 BLAKE2B 
41fa48151cf9ba20aaf9161ff1bc48a890a165107784e41e9e7535093ea7fb833ed5d0ff75534bd721ff1c80dc52d55b3585c3473917c665ee4d0f107d7e1e41
 SHA512 
afc84a10b96e70b859ec328f8d803d7e270264c8649492899292b92650840586c08e1df3196af41c09185e68f2d400cdc302bd0a474cd4ee86c34979098fae48
-DIST linux-5.15.39.tar.sign 991 BLAKE2B 
e1b9446d695c20140108320471fe9f6d9c95a0d525ae1e88b5a4acfbb082afde83272461befca10e253799b088cbabd856256d83856ac03aca0e5cfb4c787f63
 SHA512 
30951a220de1f8cef56d2f4267d12fd78f03a966b11af0bf74b4521c746147549215a6d435c130f230685f2bd90500ba47fe1b178cf5aa560e3024ba10b7de8f
-DIST linux-5.15.39.tar.xz 126317316 BLAKE2B 
c2b7e8e944e30aca07b70355a89b86e15756226e8a13826e749b330668cca28e0caf758c1a4f8166590d5a26ecda49f665ad0caab4c800c599e857fdf281ce3e
 SHA512 
712608b95a53ff3ae31313c518614c1376a809d621d845bc23f096243f3ea509a11e451b14709ce4ed48b964547f177bcb20d57e62806938d129e0187a2cd296
-DIST linux-5.17.7.tar.sign 989 BLAKE2B 
8e83a92b4be4a20521051e04ca6229aa72441ea1634e7140ce28049f569a8e9a91a963f3aad816d8ffc89e1e43ac7f0346f9230dfb7eea6b67f8ec4f6dd7b36a
 SHA512 
8c3de748ca7d1ddc25932acca0d4dfb1e355ff77cdde9add0f6f9f911313b0a6ea797e44e8c9813bf97d7cc4bbf4d34e71c19b940daa0bf226bbba082fe09666
-DIST linux-5.17.7.tar.xz 128454448 BLAKE2B 
1c1b1f59404becef201c28d6677a2a52a828a51903d0fe5b38a931fa25694d766eeb222b02f674d95ea8c67c29e0f3420b88f94bdccfc2f9bd575c2605e8f229
 SHA512 
c70ce704b65bba14237e1ca042add6ca075b08d65e9b90d5441962ee2e6a70a58da72ee847a17917e5d170021933eea6b681a5774454f2228b2153e76b440c97
-DIST linux-5.4.191.tar.sign 991 BLAKE2B 
0897c615b6b49b0d18c2c3f3bd6767b706c5fde582c6cf2954f4ef91756b11d8d10fbe5c83ad616208ab5fbd2bceb64b358b3aaf87f4678538e85096dc9b22cc
 SHA512 
f18cf2d5bdc7d2c60bf5d2057073e4a0afffbb0673b809b98ab80ed203a4ff292fab45ac8a6faf1853715f5e3155afefbc663aff28f31166ad17a629157c6a31
-DIST linux-5.4.191.tar.xz 112925776 BLAKE2B 
c4ac730ee2d6686b844009d9ea5bc461a5eca9fe0600a3d66a819ae32e0d3a92aaceeab9785a325a5c03fc50120e650c16b349d5dc6ef7e571980859c16446a0
 SHA512 
c94b274c3d49cbf3de085fabe99a0e63ff8fd6a6628eb0f2182db06b0480bc0c67991de9c5786c1d252e020b3cda4ccb29ce93ab599065149b3211786842baa0
-DIST linux-5.4.193.tar.sign 991 BLAKE2B 
868843780609978ca9a6393914d3e4bbc4f0d5ce348247286434ce67514ae5c34f741f0a9aa137cf8eef5254638edabc439dc83294c9f9c3fc26feca2f846a21
 SHA512 
743cbbb2989deeabc881efb1c1b2b56d623a4c457770c6de4b4498edc826f8039e729d8dbbb0a351d17e2ff290b122d5b85f5944aa1aed7ff5a73705ade449a5
-DIST linux-5.4.193.tar.xz 112910204 BLAKE2B 
36ce7f9d1312537e2b7859af857189d63c3680d90cd9d2388be06ff8e7e048259518fa75f330a9f8b8001cc80813fda80a29fb0fa5e92cd032e3e9259261ab52
 SHA512 
36b201808b9d0870e33dd6a10bc9c803a728ff5bdb0cdee2e14e4824e21e611de98cb3e5dfef26a8b0eb7dcb4e8e9b41824e9208fb20967e226cde65ea884d69
+DIST linux-5.4.194.tar.sign 991 BLAKE2B 
d9de26a71db215341367b41d239f4d1b4efa9a7d66a139b9a75b2b853c161ace1196cb56ddbcd38bb64979343717c696778b011f78250b1c6903d97bd8cf38eb
 SHA512 
a9be800562cda71e4d06fce8254c9cef2c1932b33faef13b6ecf7f50c9bb473ae727607a09f194227d2cbf2de7d5fa9b055145a524358a4606eafe5426ec137e
+DIST linux-5.4.194.tar.xz 112918432 BLAKE2B 
5322ddb0355020847834bc0330253c079a14fd7c427563fa3e3f2756cc40d7298934aed5c7ea81fc263fd534a5b1521898a9ac576f4c0280d93dbb8e436fb687
 SHA512 
9b316e71c7f5feb263ef78f99f30b42d39a14f8cabe0e2fc87c2af94b33ced09d97167a9b6d74fa0b0e3a7eea8caa7014fe5ba09efcf8dec147bede8ea0f8066

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.194.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.194.ebuild
new file mode 100644
index 000000000000..4f5f7870ccb8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.194.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+="
+       https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+       
https://github.com/mgorny/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       verify-sig? (
+               https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.sign
+       )
+       amd64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
+                       -> kernel-x86_64.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+                       -> kernel-aarch64.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+                       -> kernel-ppc64le.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+                       -> kernel-i686.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-x))
+               assert "Unpack failed"
+               unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+       else
+               default
+       fi
+}
+
+src_prepare() {
+       default
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               arm64)
+                       cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+                       ;;
+               ppc64)
+                       cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+       local merge_configs=(
+               "${T}"/version.config
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+       )
+       use debug || merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+       )
+       [[ ${ARCH} == x86 ]] && merge_configs+=(
+               
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+       )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to