commit:     de9f245fe38df13e2c0b118bda210505bb457e1b
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 19 19:29:49 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Sep 19 19:47:03 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de9f245f

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

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

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

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 52c3cb4aadfd..20968b36321e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -16,6 +16,8 @@ DIST genpatches-5.4-263.base.tar.xz 6140940 BLAKE2B 
7a33829d7a85497a6a6c8ae89cc9
 DIST genpatches-5.4-263.extras.tar.xz 1812 BLAKE2B 
67a75053cc93216cd0b6f34e11c2cdb4d4606e7356424006d08d35583344ec09211d95d0e5613b7352a1b3317053c4c964d373736f387d76d0209bb915d9256d
 SHA512 
64b041945553ca97df6291848e4a9875fb2a2526b82d730e6d84c6838c761803a819c9765cdf953130695e2c91af28b6b0a64a4e7d37473306b26d0db6c16f2c
 DIST genpatches-6.1-59.base.tar.xz 3488836 BLAKE2B 
5e92e2d1c4ab691284991ae953eb4ec8f6ae5580d2ec410b94d4bd0c8644752d4be1fb962eb5f315b22d811bd49983f2fdb352523547d973fd712fe117f4452d
 SHA512 
29963613fbe41485226137bb35e77daa4d4b2fb8eea6c18c6d9713f1d5cd27192273b3337ca4c02af6d2dba04c564be66edfda6ea6dbbebc22b9358875860288
 DIST genpatches-6.1-59.extras.tar.xz 3808 BLAKE2B 
bad1dc9ff79b84c02f4f634764c6fdf5ef437c14076048d2e0b777f0ec967fe3dc544739684b50533accdf22d3d85af2c0422ba1183ba4ee26590d02c155cf5e
 SHA512 
451bbbb7bce1263d97bce0580729e0a948021734d6e546e318ab37da786a848d9c2376c9849894be9bc8028ee9afece670b86727ded1cf9857d236869c113530
+DIST genpatches-6.1-60.base.tar.xz 3489052 BLAKE2B 
528e6ddde93a9699899b0130c0f1fb3d4107c40e10ecee9a1ed813f6ebb2831f4b2340bc5932e98a7cacb79886d14b5ef5cab9f66b207f1304caba6200775be6
 SHA512 
05de7c393477abce8633185c588ced4568c3c7d5394d5db1a052942e4c417814149fd99f669521917847db482c442ad54b886b018c9edf20028cade120ae37b0
+DIST genpatches-6.1-60.extras.tar.xz 3808 BLAKE2B 
fd36141eca7e2e6c1f70b12af7ed21442b3b79ca63ce8dda25a7a090e94d752cdde9d6d3dd1b548c629820779126a78a774d071790d936fcf8668757111c22ae
 SHA512 
a2a0affb5af269512403178d90f25d1776948d20c640fc29743846a44a0aca98f3883a5270dcbdec9eef99006b919769f6c702279647af159fedfd6e236acefe
 DIST genpatches-6.4-18.base.tar.xz 1040816 BLAKE2B 
61ce7d234cba40c266e92dbab80b26e9958d9501fe884ed1fe45c25a89f2385259d5776049d7ce172c05d6829a92f591652544d7a3ce3ce7c81d09ce871800f5
 SHA512 
559a4e9690a72dc76a0ab38f463149dc9221bad128b59fdafc1250b964af2ccf573ee0d4e593e98811f83325a0d10772a6a6b32bbaef50aee3c5a0d1938677d7
 DIST genpatches-6.4-18.extras.tar.xz 3700 BLAKE2B 
b360eff83abdbed397db6405b6b68649a3d6f85a37716eb2f923d47dc3ae5d738ca49c29a58dd2f236c7f50dc233641e3df15b7b75a19364b0af6261afc36d4e
 SHA512 
778791e5e9232bc432119d14a016c00e1a968af30f0a2dd931ebb4103f7f457db991eb1d9ca500d1a3c9295dbf87d9b4fab18ffaebbd46cc8c82077b27c344e6
 DIST genpatches-6.5-4.base.tar.xz 258812 BLAKE2B 
df197ed4a66568eb823c889b15f126c66b6acb9a2cef224e198e576d601f1c5d1ba43bbecf510585adb93445f2fd634889714a31101fb2dddec67da9052adb7e
 SHA512 
70b21a38cd4a2d1759819341365de33590d8d3f460d12cecd781dddbdc69e87e66f81389d8a1bea381bf74188c19b667d3c7789a92e3d8f80080982ba5d39872
@@ -60,6 +62,10 @@ DIST gentoo-kernel-6.1.53-r1-1.amd64.gpkg.tar 72478720 
BLAKE2B 9bce87f82539a8f6d
 DIST gentoo-kernel-6.1.53-r1-1.arm64.gpkg.tar 65208320 BLAKE2B 
4148c417ce291133c6b7fcca376f9db7d9f8a5254ef263146b15b29fb12a93af38a6082e6c49c50c09e831587003cdb459e645e759d3f6e095cccaf93c76994d
 SHA512 
da6fb9218c69f4da49bc1de22a47943460bbd4630c75b0e3b75952e7991c545db96f1ff753b969d85997d2152f910401086f0a68926ea0814eeb979da912b4d1
 DIST gentoo-kernel-6.1.53-r1-1.ppc64le.gpkg.tar 59822080 BLAKE2B 
657c66102de78813e80599101c63a19b75a113ab581c5af1c284f205ffbcee5257b55ddcdb7fa2dbf491dcf7619c3f23678a9cbd787b4e375e7b15991782657c
 SHA512 
756f30a9cbea8864443e38096804491cbe113a7f8f781b82ff4229392b34befa7eb0985036d02092994041a2eccbd69a9101e04051f0f4f9f5c1dd3ef948673d
 DIST gentoo-kernel-6.1.53-r1-1.x86.gpkg.tar 61962240 BLAKE2B 
1809d9cd755a88ed2513658f02c033d6a7ed7acf821f2e179e1812c9afb1fef3d947e6dfd6fedcf1cabfb77b05820db4d6d888ffc7f45facfb657e9ec614a986
 SHA512 
68ad5671a6f8d5e9a6e562ba5bfbb1ea2427944bc8dd22fff88bd5b8114271640e9161e6f20fc0c2c6de66ca2db78cf585b9296897490634171898346f71d560
+DIST gentoo-kernel-6.1.54-1.amd64.gpkg.tar 72488960 BLAKE2B 
5f95cb1ba36fbcdfee61d2e19e73693996ce26238a937b3bcc68104f0c2e836d0cab899efe22e9b5f894e6e65b58d11be4164bb43d3af2cb8857523f2dcb510c
 SHA512 
e434062a09c46b0db545e55b64824e44bde385b08b8eccf2a73559585f4bb078cf67eb715ea64ed7aa0f76ddc449260bf5e2e72541ab8471ac0504d7d48c2845
+DIST gentoo-kernel-6.1.54-1.arm64.gpkg.tar 65208320 BLAKE2B 
bf4ee6a70cb410f29eee3d27609753ab3d15741f6678086e8f431ad8bb907b669e045707e7ca75d8cc49e8e4b3ab439a30f3d286c662133ac5d3d9f7742b7055
 SHA512 
da1368ac0083cdedabd54460aadda89f32b547ec83145cce4dceb0f2218504c23a8bbadcce632fbbbc2fd8cdfb08f3622a5c6ea41fd06da8dce8868848c0212f
+DIST gentoo-kernel-6.1.54-1.ppc64le.gpkg.tar 59811840 BLAKE2B 
5484bdab393f6c558d7d8f3aa41f83d823bff2d3c41da959f46e84ea1403cf5150ff281cc53876e85b385a32f9789a40f3a02725549c86143f4f4394ca2cc770
 SHA512 
8b060ca9e057c8d7e4903309736cdbe31d8abcbf361a3d135ad6bd70dd1ef9ebb29d0fbb89fca7cf2cf1b32e4b66ea9800aa625e87b0e23ae9f41c6cdfb894ed
+DIST gentoo-kernel-6.1.54-1.x86.gpkg.tar 61972480 BLAKE2B 
4e8f7ad10b887a0911e444c100921a3e103bd5dd9e3514d23260f91124044af69e6cbe80f19613b38266ae96a506f8f10839a4aadabac9921794f87557a3b5c4
 SHA512 
238092cf5c87300ade918e90dcd3f127bd28f488a1759207f079989c60a5b83fa5c925f750ad5facc403431c649a0a14d58c4f38b72e55b71ac145e185f27a10
 DIST gentoo-kernel-6.4.16-1.amd64.gpkg.tar 81786880 BLAKE2B 
adbe09acd265ad50d6cc362be262b94b10fcfc517dd5e463007eef455477c1de7b9340ca472a60c28bd7fbcc02f8538c25b036d736e656500bf749a67ba914cb
 SHA512 
cd3c7a1641b500620f3a8770a2994d53161582ac3c5eca72cb64e4e15cbbd40db1d8bf839a5427662574eb8d4124f2c6b2b74dc087e70b6992d2c522939b87a5
 DIST gentoo-kernel-6.4.16-1.arm64.gpkg.tar 71290880 BLAKE2B 
b42a0cf9dc72716eaf9d14137c06d8229e06a4431b50ae269bada18d977c9fad3eef9b7b5181cb8f7b35b88987ab2db17bd85b1742220ebc8d022f50eef066f6
 SHA512 
789f3bb759b470f4e29735706a73c64df0646c882c6bad3b051dd395faa89ce2c1cafceec34ff28d9c5c4adf6cca4f5eec6b875bf0e398c925431f9086f3e756
 DIST gentoo-kernel-6.4.16-1.ppc64le.gpkg.tar 63488000 BLAKE2B 
e0604a0b4bf8d7aa7a257798148fac11e0c4a072e0a775c57ddfa74681a265a775081b91e64732e45656fa303e817c2afa8f5c281ad2c5ffdc4373674d5917d3
 SHA512 
4aa5e73de475bd77f5a0e155033945b5770e761433e3cd983fe5efface2b971545439e99d0c048ed3bc21aa825d3eefa4ecf6615bd0099374c50cc0fd9e90243

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.54.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.54.ebuild
new file mode 100644
index 000000000000..83c6a5e4fa8f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.54.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##*.} + 6 ))
+BINPKG=${PF/-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