commit:     b78321288daef3922b1fffb844e7d0f798dcfaed
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 22 17:25:50 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep 22 17:27:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7832128

sys-kernel/gentoo-kernel-bin: Bump to 5.4.148

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   4 +
 .../gentoo-kernel-bin-5.4.148.ebuild               | 117 +++++++++++++++++++++
 2 files changed, 121 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 0d80ba4651c..eb85293378e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -48,6 +48,8 @@ DIST genpatches-5.4-150.base.tar.xz 3930104 BLAKE2B 
eb120013120a98449c8df210a5a0
 DIST genpatches-5.4-150.extras.tar.xz 1788 BLAKE2B 
b408e6247a66358208489dfcf3bdd6aaf47a471089ffa8517a52039535f276ab411931a7c1dcc17b7d2aee99a49e530ceb43cfe0c59ecff982da40337c22e375
 SHA512 
0d1f94ab3cf4759f1f87a63d95ecb00c7a4c4c982b6bf73137bde0aefb1c07b037d8e613966c45cf3e4122e0c93771011e8094ca4517fe3da9ec4dd4e2820e35
 DIST genpatches-5.4-151.base.tar.xz 3930340 BLAKE2B 
1184047bb8e7b7e51e09e8bfc4bd40b83a4b5885b5686184097baacc759e7e3050b71df21f3c61b2952053a5c90c0116f6aafe1c911efa66bb806978f752c9ff
 SHA512 
ea1cc2c6702989e1cf2db5f2b605a559f046ae8a7b1f9dc0a5c6e123a063b0ac5199c8fd582f4c26c0fa016b4a1b58c67c23ce2f8c4f67bc1cf70f746d47b11e
 DIST genpatches-5.4-151.extras.tar.xz 1788 BLAKE2B 
b0e61b381e67be61a6a2f550a8a336c065a4c8c49eca7111fffe05f6154e72ee832e8c27ae6aaa0f2fe5b0aec797538ee97e01521d51bb492c1e3faad36fe5b1
 SHA512 
42512877cd23307522ae484a04b52c46095cdcc59223432fa1a66d9fbe41a40dc336445e68f8fda184c5d669a848132c066bacbfb282fa925fdccdacb84739f9
+DIST genpatches-5.4-152.base.tar.xz 3987788 BLAKE2B 
ddc01301f5c778230159b9ea8ba107bb992ef7a8bac0f3068c40e95b5dc32eb701b0c11f4b5ab3dbda6e9f3c29c04612ecb623aade7bf38c7f852aefbba14432
 SHA512 
bbccd15725d1351be6f5feef202b3ae3760346092849902cdf3ca5cb3add804458244fd8b8cfedf39e1917e1a7dd7cba9873df2ab449e36e32a169b1640d34ed
+DIST genpatches-5.4-152.extras.tar.xz 1784 BLAKE2B 
f99caae6094867a9535056ddb3d5cd9b9154f33417a5cddc53dbac79d5ee3f430e5d84ed4607a5bc72c2217049f7677fd3d19594096f61880d6c31e925bf5e92
 SHA512 
cd69e6dadad1eba57a6184cc65330c6497f8b822a025190a80d10d4d7c669bd4d9195bd880ce99f8384d6aec5237358b03e45ad8449f1c394d5743ecbb0da4a7
 DIST gentoo-kernel-5.10.60-1.amd64.xpak 65504358 BLAKE2B 
233766cf8fd62c2b70cf257a8bbf5dab9a45d1d10b508827c58593c7523b04e3843a69f51dd38798f5889447eae8a861f8b3cebe5985e48b63c65dbc7183ff4e
 SHA512 
d547eee171746da27a4d1ebfce701b18c1e8fcded3c46c5ef875da6177645ed9088bdeed4188bb2d6746311ebe839b077e1a97ed5f9f7fa14ed2e43129701780
 DIST gentoo-kernel-5.10.60-1.arm64.xpak 61199661 BLAKE2B 
1d004eae20fe67cdde4612d56e648cdd22975a1b5b418c0e1b80a1f9235f1b0917f4af6f8946da793dbf9fa20a42033ab397ece19308bea10b0ce5c550b45409
 SHA512 
649886a2117b8318dd03ce8a85905abb79cabf888ee5441da5a56d22354cbcda5be8343ada6335310dfd6192d5f3e145220aaaa52d3efd6b943151c0a3692f5f
 DIST gentoo-kernel-5.10.60-1.x86.xpak 57229580 BLAKE2B 
90b7d12883271c0ac49cfff5ece81fde229c2f9f5c27c21d19c4c97132dd091bb798d75332c72491178655d8350e30addf868df71562bbaf645af5705d49daeb
 SHA512 
043d1a0c5cefc49188a444b2ccc85decae53a318ee759449af4b30922a46329d57e1fd45f40b5c74b74f08e0cc5edc2835ba8291be460dea9699a998b9e1a6ac
@@ -118,6 +120,8 @@ DIST gentoo-kernel-5.4.146-1.x86.xpak 53156419 BLAKE2B 
95b47c9117ae4b87cd5857800
 DIST gentoo-kernel-5.4.147-1.amd64.xpak 61347875 BLAKE2B 
41b273a3ea9af3606042d11d19e19c4da1e2ca94c0e04b68f05f4790dcd360b5f42ba3bec08dfabd3a6700c02e55c0bb341ae3820c46bbf7cdd959582872ac35
 SHA512 
282c251b24fade207ae8d0b2242e40f442bd4156abed4e82d1991370df4f4024bab7c236374178f025351b92c8c91f9fb7aa86c3d7afac2cb0d89e0955ce4ddf
 DIST gentoo-kernel-5.4.147-1.arm64-r1.xpak 57992645 BLAKE2B 
2082ba9faf0b111ad75875e09d2777a9a246077446d5e585155406fe5712883a90b625dbd3b09d6c80a5f51f0dd0d9d6baae3120ab03cdf082f77f01da3c2c57
 SHA512 
449192602073260e19f9c5b7bb31e959607e0b96876e63a1e75e4e9a79e435cb00b7ff57e1c4b297283ec6b07d407013f83f771894ff80df4f29c3f7c257bf1a
 DIST gentoo-kernel-5.4.147-1.x86.xpak 53170376 BLAKE2B 
26c845e525c9cac5f31dd1e8cd19407cd367af395f2c2d34bd240c166d457fd3cbc86f9dfe3f10b9379110fd8c842edf6746345d3ff83ccb861c921aa1980ff4
 SHA512 
ec74127841f6adc7be48376d20365070ed3c4ebde3b9f2c2f5be8107f16665ddab1e88319448ae6a059e1f29eb0e7349a2b4b01111dea60d9052d2e8fb233342
+DIST gentoo-kernel-5.4.148-1.amd64.xpak 61364378 BLAKE2B 
2d5a665f5ccee0de5abc78d593b8bc6f1da0fa6fa9573ee9c0a65efaae9629ac3ea0b26a4b83e6abb23eee5fcb842fd67a395af35fb5476529b30dc0739d7944
 SHA512 
277064e06bdf25fc67f0894ab1d8116f23c71488b92a1751833c6aff684c7f2d28e2116e31d40878caa3f741fe9fe61f1f0c3cfaca4677298d2851b22afdf1ff
+DIST gentoo-kernel-5.4.148-1.x86.xpak 53159913 BLAKE2B 
7269d52529bf78b43819ffaf435d129ad6982f8046239a15da5c6df359feada8793fed93b206e3aa031817fbb235d221d7468601f7091f40cf5bdd16c30100c9
 SHA512 
07c4e3b73122ac915695858891fb408ed17ba11ed8e6adf1e17b8eda6ec4112ef293db5154067dfbfd8d32ec6b1380797f87263272c1b16b6d1044476e054a05
 DIST linux-5.10.tar.xz 116606704 BLAKE2B 
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
 SHA512 
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.12.tar.xz 118112412 BLAKE2B 
842d921b9a73d2aaade763dbd2ec67bdfe0275baa6d628b775f5c87574ad7dc86f0419afcd48c10c1235f4bffa16084243f2cf4556e6afcd391e975fe8ba530b
 SHA512 
be03b6fee1d1ea8087b09874d27c0a602c0b04fd90ad38b975bd2c8455a07e83c29b56814aaf1389e82305fae0e4c2d1701075a7f0a7295dd28149f967ec5b3d
 DIST linux-5.13.tar.xz 119297284 BLAKE2B 
9c4c12e2394dec064adff51f7ccdf389192eb27ba7906db5eda543afe3d04afca6b9ea0848a057571bf2534eeb98e1e3a67734deff82c0d3731be205ad995668
 SHA512 
a8edf97e9d38a49f1be2bde1e29ad96274bb2c6f7e8a2bebaa1161dd4df9cabcbaec4ff644c45bee94f86ae47725087d6deed0cd954209cec717621d137db85e

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148.ebuild
new file mode 100644
index 00000000000..19484744cb5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.148.ebuild
@@ -0,0 +1,117 @@
+# Copyright 2020-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-install toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin/}-1
+
+DESCRIPTION="Pre-built Linux kernel with genpatches"
+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://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.amd64.xpak
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.xpak
+                       -> ${BINPKG}.x86.xpak
+       )"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel:${SLOT}"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}"
+BDEPEND="
+       sys-devel/bc
+       sys-devel/flex
+       virtual/libelf
+       virtual/yacc"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_unpack() {
+       default
+       ebegin "Unpacking ${BINPKG}.${ARCH}.xpak"
+       tar -x < <(xz -c -d --single-stream "${DISTDIR}/${BINPKG}.${ARCH}.xpak")
+       eend ${?} || die "Unpacking ${BINPKG} failed"
+}
+
+src_prepare() {
+       local PATCHES=(
+               # meh, genpatches have no directory
+               "${WORKDIR}"/*.patch
+       )
+       cd "${MY_P}" || die
+       default
+}
+
+src_configure() {
+       # force ld.bfd if we can find it easily
+       local LD="$(tc-getLD)"
+       if type -P "${LD}.bfd" &>/dev/null; then
+               LD+=.bfd
+       fi
+
+       tc-export_build_env
+       local makeargs=(
+               V=1
+
+               HOSTCC="$(tc-getBUILD_CC)"
+               HOSTCXX="$(tc-getBUILD_CXX)"
+               HOSTCFLAGS="${BUILD_CFLAGS}"
+               HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+               CROSS_COMPILE=${CHOST}-
+               AS="$(tc-getAS)"
+               CC="$(tc-getCC)"
+               LD="${LD}"
+               AR="$(tc-getAR)"
+               NM="$(tc-getNM)"
+               STRIP=":"
+               OBJCOPY="$(tc-getOBJCOPY)"
+               OBJDUMP="$(tc-getOBJDUMP)"
+
+               # we need to pass it to override colliding Gentoo envvar
+               ARCH=$(tc-arch-kernel)
+
+               O="${WORKDIR}"/modprep
+       )
+
+       mkdir modprep || die
+       cp "usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               "${WORKDIR}/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "lib/modules/${KPV}"
+}
+
+src_install() {
+       mv lib usr "${ED}"/ || die
+
+       # strip out-of-source build stuffs from modprep
+       # and then copy built files
+       find modprep -type f '(' \
+                       -name Makefile -o \
+                       -name '*.[ao]' -o \
+                       '(' -name '.*' -a -not -name '.config' ')' \
+               ')' -delete || die
+       rm modprep/source || die
+       cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}

Reply via email to