commit:     2699d443df822bb54c82e7c6ab368e2b8716d6cd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  7 17:26:06 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jan  7 17:27:14 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2699d443

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

Closes: https://bugs.gentoo.org/888187
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.1.4.ebuild                 | 127 +++++++++++++++++++++
 2 files changed, 133 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 0474646083dd..60800e6ff65a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 
66670841382237e0d222ba04fea65c9
 DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B 
e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef
 SHA512 
17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
 DIST genpatches-6.1-4.base.tar.xz 350692 BLAKE2B 
e310351161d4e0bbe0f498285da235a12b585fe5974b9dd35d6567af5eadcd291d63af5bfe036b7f0c03fb5a5c4285a7a4d771010474eba32a2bdd806f95b808
 SHA512 
42888c297a002e68575a4fb8f5de844418ff610b8770d544404b1c410c86f68f1a1c28c60d32ccea34c10d2ee8e0383e057cb24d4a99edaccbff6388570c5b24
 DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B 
af64347e6fd2f640d86b0839feac7c6768489235fdaf6be7bc46ced24cd0e20490fd18b06096ddf2ad7ac70973339c895e75aa2ce3d19e368b87a4a0219fe54c
 SHA512 
a0a94512517ece1bef28101433e3f59433c87a0e4b1f7c3937ae4f753a3d3c49f14e5a6780c9d4416082bf5282430e0386dd9bb72c924af72bd1fd902586ec0d
+DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B 
c3aedee62099a942b85016df0493ca1ca403efddc3c6b8c3e5d91246448cdc2a3626af200ee62865270f3ea5bb9dff131fed425fa78f6ecbaff08818e7a48022
 SHA512 
c3b8b2e58e4f6e5c7750d8c2bed54952feac33b319c318f562b8b5a894ff5d25ffe0149f5373f2b1655c1be6757eef8c6890460228f54828a42c59a1f869bf45
+DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B 
ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562
 SHA512 
e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
 DIST gentoo-kernel-5.10.161-1.amd64.gpkg.tar 66498560 BLAKE2B 
6614aef018fd06c61edd76c8526a96d72f73225ce915fa8bebcf835bf1a92de5f3bbb6c9045cc2cf38c326b15d7d00b236a609b8dbd2f50296ae0563d0b01c58
 SHA512 
e370627c308d0f9ad1cd9972677a61d2dae152e8cb849dd772e3d1d60d3fb4ed195ae048705bed4bbb663c6532cb1465947a31ada825a3fa66e2aaf089acd115
 DIST gentoo-kernel-5.10.161-1.arm64.gpkg.tar 59658240 BLAKE2B 
e88ccc74dea87976843b87bd96ed1704d588e519913d4376cdbe80cded1e3a4370b9c3cf692e510732ef15505ab5497db1d5c5091b523457e644793b0dba6c0c
 SHA512 
8f7648ecd4e99c3ebd8bf67f33924df60693cdad47f027c75b8a68bd3efae23defe9f1caee2f2604d58b931439d557ef263c98a6a6eb6171c7a2b8b91f2b1d60
 DIST gentoo-kernel-5.10.161-1.ppc64le.gpkg.tar 55050240 BLAKE2B 
97a879d136891448fa86f598de5ebefe875bbd2b35c89ebd882b6913cf02a82de9981afdd25d758649aefcfd977edec2ca11d603271bdb17a76097b3333cb3e2
 SHA512 
2f5f0a2dd49caefcafe44ea8603f615be5487e1109e6aaee21553e6b4d9b516e8b0ddced4a85cdc355d363e9ddeb431b9c7c3fbc1806bec5d4bcfd36195c77c7
@@ -64,6 +66,10 @@ DIST gentoo-kernel-6.1.3-1.amd64.gpkg.tar 76759040 BLAKE2B 
5214ac8f7c103078be9e1
 DIST gentoo-kernel-6.1.3-1.arm64.gpkg.tar 69304320 BLAKE2B 
58b2d41b52883b5cbab05869e94e7aee98b142d10fec0fb8e43c079e3f345efe9911795428db91545e17f670f7069ac0c88983dc4d2d2e3a777d6f4369743341
 SHA512 
28b80476b35b79cb9074ba9f0e47c5a8f9b6476bd4c4a9382d19c505661f0c1348acf9640d4e657f8c9ce471903ab98132bd828bee9252861ff87a93455f9900
 DIST gentoo-kernel-6.1.3-1.ppc64le.gpkg.tar 62730240 BLAKE2B 
fa7af513a96bd722f47b8c22a8ff76c034e3d5181ea171ebd719ef2bae1e9dc173f5425dbe4d909b614406dfe62744d93e94bcc14f0a2ebf41dd83d26deb3844
 SHA512 
a972539e4dae44556352755f0f6c0698a2af89d43f102c64bd1a90ed33cf6def6fead36f026bc44d863c688a41f19806194b249cf1647a26f82716bff6c5d6e3
 DIST gentoo-kernel-6.1.3-1.x86.gpkg.tar 65966080 BLAKE2B 
30b5dd6accaa62cd51275589ce692f6af102482f17493fe63952a3d5f860c69642cbace872943e94a84162f6c623089d85099783aede28ab8f2304cc1f376a32
 SHA512 
0eb880c0eeb6d7667af05ed2813d7b5eb4a39ff2fdf76ff8c48718b1a1997c053acfba9d2cf80dd2588a0ba667a4436a6521e5373a155dbd68e0286bd7958fce
+DIST gentoo-kernel-6.1.4-1.amd64.gpkg.tar 76748800 BLAKE2B 
670bc8f61cbe4df7a1f3e169aa8a88830ee2b4d909fb5b315c28e0279d228b81c0ecaa185f65c0ad832b333f7b8a6847d77e7cfdd19bd6bffeef6fdcd7897891
 SHA512 
9cd580cb2384fa8890ad683d2d2da75d3b8fa533e46c3e2a945cdc0c01855b5904024ffe53a490cd1929c5270b6ed065d22a6024012af5ca6e7df8989f00f3cb
+DIST gentoo-kernel-6.1.4-1.arm64.gpkg.tar 69324800 BLAKE2B 
ce6a67a1222314ef1ddbc698df42d6b61d90599fc0f3c2070b7fc91d036d44f806791adfdd9e5d52364b9357ced40cc2a433f893185c1d6c9ef767b50ca57ae4
 SHA512 
d83428226c3f394ea0b0639385aa914211dc4845ab6d375f24961f33f46ea477e457f1e09480a6bc4f7b7195bca45bf672197c29c5af2ada52e029c07bf66279
+DIST gentoo-kernel-6.1.4-1.ppc64le.gpkg.tar 62730240 BLAKE2B 
31616dc52fcd36a075e414e1863581b8d6e5e3c3326cc743dd26eb7a64c95de285a974176e6a26384136e7dd71f64764c002f73856b09d6b4c9f8afced5ad1bf
 SHA512 
f779a7afb735ec37828c9f56a681fc55971168921a15a3db8762ff38a1a20b5ee1d84a5ba33b17d94a6303dab9ed0c8458f6250e0123669a34075c27765ff391
+DIST gentoo-kernel-6.1.4-1.x86.gpkg.tar 65976320 BLAKE2B 
e47087b8819b05fde7701b7e85a5c7c3f70ce54234100fa5b0a5077eede01b3db955cd5c353fc45674775258bf6fb4e9836a6eaad2c07f5f84d349c590b14592
 SHA512 
dbd68b80872de1afe494cdfa314c8cf2ba80ad10e438ed51708529c4e862b9322b110499f82b34934b7259e3d2665ec2c5b5c602b9d3ebcc19d2d6077b8daedf
 DIST linux-5.10.tar.xz 116606704 BLAKE2B 
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
 SHA512 
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
 SHA512 
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 
193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13
 SHA512 
9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.4.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.4.ebuild
new file mode 100644
index 000000000000..37a5c18539e9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.4.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel 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://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.amd64.gpkg.tar
+       )
+       arm64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.arm64.gpkg.tar
+       )
+       ppc64? (
+               
https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.ppc64le.gpkg.tar
+       )
+       x86? (
+               
https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+                       -> ${BINPKG}.x86.gpkg.tar
+       )
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+       sys-devel/bc
+       sys-devel/flex
+       virtual/libelf
+       app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+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 "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       kernel-install_test "${KPV}" \
+               
"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" 
\
+               "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+       mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+       # FIXME: requires proper mount-boot
+       if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+               mv "${BINPKG}"/image/boot "${ED}"/ || die
+       fi
+
+       # 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