commit:     4d88bdb61a98e2d910c8ba4670fd7d8f1a6f507d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 05:58:08 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 11:06:43 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4d88bdb6

sys-kernel/gentoo-kernel: Bump to 5.4.21

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel/Manifest                  |  4 ++
 .../gentoo-kernel/gentoo-kernel-5.4.21.ebuild      | 73 ++++++++++++++++++++++
 2 files changed, 77 insertions(+)

diff --git a/sys-kernel/gentoo-kernel/Manifest 
b/sys-kernel/gentoo-kernel/Manifest
index ac2c8b185ee..dfef79d65fe 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,8 @@ DIST genpatches-5.4-19.base.tar.xz 782808 BLAKE2B 
9b0b3e6090e33f5852c3fdd2ee5811
 DIST genpatches-5.4-19.extras.tar.xz 1740 BLAKE2B 
85acc37c0b0087ca198bb168a18b764e0b2061c9d41bb1902308c517b1760031258cd7221725b7fa3145fc7b802b8bd8bb10c241ac5ddb6f1b4436ae92d4c783
 SHA512 
59701650a902e708c98d9e6ef3c5528be0831d8ead28ef2d46f1c4cdb386336ad36a137a4d77d0193c7acc10b1448dc54a18dc4177365d56069c7c3fb5143ae2
 DIST genpatches-5.4-20.base.tar.xz 807268 BLAKE2B 
e5930087b8384c74c699414d1396278e25f8c2c208675976d5b46f8b34cb22a5f02f6fc88d7c3630796628122e5774e245ffbfe2542b3fd99527c1f391ef8648
 SHA512 
087e244b8dc00117ec9d4773549479538b0d65598f204da337e37425e76d0b42330a227a06d49e7f49997f3929fb5a4c9ff8faca65aa12c358093fe5556aff52
 DIST genpatches-5.4-20.extras.tar.xz 1744 BLAKE2B 
ca42cfee9974f2c2ae029d3041fb510d206721e52615c705f0c586aca0e91bb469d24a35d93f156f5b3c6077b9e6cf3dc50e361124310bc4321eeb20cd4e08e2
 SHA512 
980534074d620aa6e9eb9d8cd9c6ee64d9398dd210c6d3b14359af96da441cfee576212aafe4777b914f9e9ee6e9468f628570d42bfebe7967c8fb72a6568ead
+DIST genpatches-5.4-21.base.tar.xz 825640 BLAKE2B 
2f6da03c546be189d057dc44b5772f56ab25e8ff50b8775524b93af1387651e98c7a8077dd8f1f1c094767499256ee6336ba6fd28f9fad7dccef3d82f72899bb
 SHA512 
c408a85d4e6929b10f0cda2315c0b0db69afe6916b7fdcf6f86dd9d607b4722fa212e772ec18eb162ff031d2ec0899e4dbef934710d80f17d7c90a8bea8f7e72
+DIST genpatches-5.4-21.extras.tar.xz 1744 BLAKE2B 
c033e92c37a242bb1df4d3f75c7cba258bd51bc918e056632d351e801ee5ec0beb0f63f54be0eea3f45b1e5850cb97579ff287714f0d3d53898b6e57ba0b9641
 SHA512 
14b17b599ad1fdfa72355ee0450fbe448d28216ce5ed5f96a750bc633539e7a9d1a2547edfd658cfcf9ff8667f929c6c0966c3725fe53f69554a6ae7c2e5e210
 DIST genpatches-5.5-5.base.tar.xz 169776 BLAKE2B 
781e5e23d69eac115dcf243bcb8a33b6793f1e53f303c634e80b32e6507a4d13f83ddf75b191dda159f4f55e4d00cc8cb1cd131039f6c5411e775c670f0f1ae5
 SHA512 
f177546e168274c4f814e50839f8f797f45eeed6690868131a0fb2a9b450051cd62ebe32c2118ac6e719be0daca5bafcf44696f69b0c5d5e23490ac5ac1dd362
 DIST genpatches-5.5-5.extras.tar.xz 1744 BLAKE2B 
0e040d013f97c2406cc5d0905fcdff3fe25f886ccc6d8622d7d76feb9f0fc7bb5fe6729a773a0bd5de3bb6b8654df38134ec8e44b0e72ee7c0230f8503efd802
 SHA512 
ae5e540a56d31a1e1eb21b69bf3fe229bcd402829e068bb2398e585579652254e84da2ffc11c7cbd146aa619dd047a7b472b05234e008288293bf7bc2b7c1761
 DIST genpatches-5.5-6.base.tar.xz 202848 BLAKE2B 
ec6c214b74f2090d241aa0ec3ad2fbac6c50361e37a5bcb0175a1b1dc4af1e75f3bbcce05785627d0d49f87f9a8c03be245436eff0fd283a42642a781f5afd88
 SHA512 
e58e19dc8b4d07370928c58b5b52592c46fd097d052fbb77adf4eb8f8be79771df2b4caa8c390818283a27606eebb98ab506ffe6a23bdc90a243e8a0b0b9dfdf
@@ -19,6 +21,8 @@ DIST linux-4.19.92-arch1.amd64.config 222487 BLAKE2B 
a658d80d85525287a1df9053ca2
 DIST linux-4.19.94.tar.xz 103389152 BLAKE2B 
291db6f448606a4ba288295b4b1c0b813e736534e4749a152baa1d07fcf52bba2b59e7b4b261594a2deb9ad961afec50a28b4ec126f97033f1c0a36aba9f2961
 SHA512 
c6017e854ec06054c658042c2e8227d79284ecdadf0a2e1c5da799ca2ac165a266e7d33aa52361d0036ddb3059e3b24f0a68b45ffd84d87394d3f41492f6f9a4
 DIST linux-5.4.13-arch1.i686.config 239816 BLAKE2B 
e776321fa163759332e7b5e3cca6a8a3f7124fc7a5bdd498f0aeaec1f2a819f27a87ca6f9f3fb0f0b9f28e8ba6f207bb27c5e48a494664d21ea3845e99b1eab4
 SHA512 
4e083028a140fcd2e65bba3c39e9d7bf9004e114b3233e8c2ab9e67405a3db9179c10a9564407bf19875317a352453f3e02f137297941277f694e687d3b97674
 DIST linux-5.4.13.arch1.amd64.config 241498 BLAKE2B 
3c6d13d84ea75247fae4f4474648abe295fb6ea577d4c9becc58551c3954d35a72edd5937b7bb345f783fe2015940035d5f6766e08e5a9dd6b8723cc69c85ee6
 SHA512 
3039a333f3000f416bfccd7efdc54c8ea07d9b01b349be87f83b7dcb3e0f13a1f3fb02ccae42412cf28958aa7df42ef73f87e637269c7525476d73682596fa07
+DIST linux-5.4.18.arch1.amd64.config 241388 BLAKE2B 
dacc83b154eab51e3c7f57bba6e02a4edfe34fa584c907f514b8afe9cb7ef39aa245caf82a35f648e379883fbbb6426b763879676cd3cecf741bcf342f165a81
 SHA512 
bf211c4293f7dbd980bfcc47fb337a2db359f1320573f5086a5ec60a0c50b4105723e010212eb6d5b9c2ba3ecb5fa4381f8b67c16596647c030b4f49274120b9
+DIST linux-5.4.18.arch1.i686.config 240651 BLAKE2B 
9e00b28951593aefc53cf735bd30589e44c9326f53ff98f7b2a244e171192910f93ab9f20d879ec06ace9b1169a6b3d3d6acf2105736905cca3b9c2db1cc8e68
 SHA512 
0c9331fd1256e044734d24d4ca58e2677604482aa0ce33f65a5df63dce4d2615ea9686a53a0e603956437d9b9d23e54389459d7ea0bfe66597609dae96952785
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 
193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13
 SHA512 
9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-5.5.1-arch1.amd64.config 243880 BLAKE2B 
d8a5b3fc87c462000ee63bf8611c4075737a61a7fa939b941bb0b139f5e94ffcf53809e3ee1a80b280d2ad2241530f2aa524fbbd291c1198f0aebeaf3bbd9718
 SHA512 
0b58154a521e41f6275f56198ed8613afaf70b3b793aeed526c00caa74f94dd6191f2358e4678e18add05f6423f472372a1f5cf6ea652197da296ed2a5628ba5
 DIST linux-5.5.2-arch1.i686.config 243261 BLAKE2B 
dc0a7efb9c94af540043db8e559c04bfe2eb493158b0fe7d25984b85ae364cf262cf78ee57f1b1b6c4e9cc51138be15c098268e77f63f158702851352952837b
 SHA512 
29cbf564fc30f9e8030001cae09d2711292d4e2c9c66f96a61a7d1575dd93d86f00d356697f011ff3810c8db95f95ac1fd54d6220c1f9095797891c29a7e2723

diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.21.ebuild 
b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.21.ebuild
new file mode 100644
index 00000000000..49f94f6888a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.21.ebuild
@@ -0,0 +1,73 @@
+# Copyright 2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-${PV##*.}
+# 
https://git.archlinux.org/svntogit/packages.git/log/trunk/config?h=packages/linux-lts
+AMD64_CONFIG_VER=5.4.18.arch1
+AMD64_CONFIG_HASH=f81c67d74936ab16f9356add6600be0de003abb4
+# https://git.archlinux32.org/packages/log/core/linux-lts/config
+I686_CONFIG_VER=5.4.18.arch1
+I686_CONFIG_HASH=c4c120c5fde43a49d84db7d60a9722e2ca1d1c2a
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/";
+SRC_URI+=" https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 
1).x/${MY_P}.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+       
https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+       amd64? (
+               
https://git.archlinux.org/svntogit/packages.git/plain/trunk/config?h=packages/linux-lts&id=${AMD64_CONFIG_HASH}
+                       -> linux-${AMD64_CONFIG_VER}.amd64.config
+       )
+       x86? (
+               
https://git.archlinux32.org/packages/plain/core/linux-lts/config?id=${I686_CONFIG_HASH}
+                       -> linux-${I686_CONFIG_VER}.i686.config
+       )"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+       !sys-kernel/vanilla-kernel:${SLOT}
+       !sys-kernel/vanilla-kernel-bin:${SLOT}"
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       default
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp "${DISTDIR}"/linux-${AMD64_CONFIG_VER}.amd64.config 
.config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}"/linux-${I686_CONFIG_VER}.i686.config 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local config_tweaks=(
+               # shove arch under the carpet!
+               -e 's:^CONFIG_DEFAULT_HOSTNAME=:&"gentoo":'
+               # we do support x32
+               -e '/CONFIG_X86_X32/s:.*:CONFIG_X86_X32=y:'
+               # disable signatures
+               -e '/CONFIG_MODULE_SIG/d'
+               -e '/CONFIG_SECURITY_LOCKDOWN/d'
+               # disable compression to allow stripping
+               -e '/CONFIG_MODULE_COMPRESS/d'
+               # disable gcc plugins to unbreak distcc
+               -e '/CONFIG_GCC_PLUGIN_STRUCTLEAK/d'
+       )
+       sed -i "${config_tweaks[@]}" .config || die
+}

Reply via email to