commit:     462b9fabb872309c5b32d4c50943a0aea17d1cc7
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 27 17:18:00 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 27 18:12:46 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=462b9fab

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

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

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.43.ebuild                | 164 +++++++++++++++++++++
 2 files changed, 170 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index 1d9af689d5f8..0fc90fc9ae5a 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -38,6 +38,8 @@ DIST genpatches-6.6-48.base.tar.xz 2633356 BLAKE2B 
3ece4f33cce7380d247fe1f3182e2
 DIST genpatches-6.6-48.extras.tar.xz 4052 BLAKE2B 
a5aa357ab175db9a16bb4eaae879d8439634ea41e525b9aac80e51ee51305399aa5f7597f126017ab856649d06a90f2e38e50663f258585793a429f20192c28f
 SHA512 
9dfe341e12629b049ed97ebcec3aff60907c5e4e4cfc6f0ad1eeed2f6b7c66535c95d486b3252cade4f92b7beec76fe2343a71af415fd3160374be5b99076197
 DIST genpatches-6.6-49.base.tar.xz 2664860 BLAKE2B 
b6117aea15e733852794addb703b28f26a8d9afbffc8d576ca11f272d00627e8254c039565221db39a1bbaf9010eaefe9608e9c2906219c78508f301eae7cb93
 SHA512 
d87482a0667a4578235366951704b8408c1f2ff91c2f2c823dab0302a85c0ca007a9c0acef17a4c231dd3d14c1392e3b18d9816f72ddf9afe54ade8613075d8d
 DIST genpatches-6.6-49.extras.tar.xz 4060 BLAKE2B 
4a63f3dcfd864b303a90247bb34de3071ec3f8be751df06e0c42e48ed3299939aa2b58a64669d091adc751cb8cb296f98d17cd421e263f7da22997e9fde3f2ae
 SHA512 
518eb6d8e295919db80748c07bcc59300eea0a0961d71e8618de9fa4371d6266e51d437521c183014ba92a35f1408c53306f5b7c6d82dd0e644209b1b73c12db
+DIST genpatches-6.6-50.base.tar.xz 2671516 BLAKE2B 
356a9a17f69416423c37c801e715dd4b03d1ebf02411a3e637e3790b4adba44db6c04f51f19a6da4ba420332cd5af1221692dcfc2ee1101825a5c8a8885c2e44
 SHA512 
e7a74df4659bdd54bf0bdb4aad8172bb1374aa563a19d28cf9643d034b59aeb55343ff5048d3aea42ddcd7561f0f723f951ab1f00c05e5ad88d20e70b7c3069e
+DIST genpatches-6.6-50.extras.tar.xz 4060 BLAKE2B 
57044e169841ec9e977b107ad32741262bf3f1455638db2d105e160f2ccc21a6dc6bcd75e09e7f0761ffe3c1879dfbaf39bbef8150cd0de407875f2bbbfd700a
 SHA512 
5c0d55dce1f869f79ec0db577d282b078ceb17667e5b18ee1abb00a6f94ee82978039ddf9650cbccfa1b8f9b99abd48057c44b230510bebe17d890e316d6c7fa
 DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B 
614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734
 SHA512 
7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
 DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B 
607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c
 SHA512 
b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
 DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B 
c1a730341ca150f9f698300f59f43d1f4ab2af44745ccd060033702112caa9941a0021e23f9a470cdb0fec51e76779a20e451b2b058943c12e153acbaca4b770
 SHA512 
e3b40a773a2c58914b25534949f9e05542eb1712b823bf84287ed546e44c9d6e830aadd4c61d4e2a72b1e2b071387a9d1131cfc9f43ee9e26d9a14785b248758
@@ -128,6 +130,10 @@ DIST gentoo-kernel-6.6.42-1.amd64.gpkg.tar 147568640 
BLAKE2B 474304044b39a82c02f
 DIST gentoo-kernel-6.6.42-1.arm64.gpkg.tar 119592960 BLAKE2B 
71a6244f25e967b75093511d0ee7c44da44f6677ad4f407f051f5d2e005535e7c90326a82e3b39c7c0c927a2431ec09b994edd6278ff6c69d9d1f2c7719601d4
 SHA512 
4d5068ffe55d5a259e5fa01d9e36ab4fdd4e2e7a181a43679e9dbd92f98f3c4977665572b72c272748851bef29c1e6a69f73093f2b5a8749d4e2d9e2d9231f1c
 DIST gentoo-kernel-6.6.42-1.ppc64le.gpkg.tar 64235520 BLAKE2B 
6d9f6e6ce30bdd96b43d3d69a06bdf72ecebd45f45a1f3de32f465617129feb7a316fc911ebcfd940ec2df8fdb1f4e07b827c33b5b5def03e5d95c55e2449a58
 SHA512 
47b25ccde3b3147ebbf00ed40924e37c42831635d87187ff5ed3afd7a053dccaaf9b0fc98d257fd5627c5e9d7612ec270b15b17c26557f4dbc807216ef1f36c2
 DIST gentoo-kernel-6.6.42-1.x86.gpkg.tar 68259840 BLAKE2B 
8f78873a8784bf65984cffec338372ce122e9e79233b74a5ecc308237c9526311ed1629f02868e65fd6849e127c7e38ccab6998b5e490b368a7b64f81ab80ed1
 SHA512 
0e7b7e61c28a2dc90bde0c746727d41eb22aa3ae30a1ed17f77598f0864f71fe66c71299969873838eba1208dab38e48808119db27d67d09e3400b3fbf5cc401
+DIST gentoo-kernel-6.6.43-1.amd64.gpkg.tar 147578880 BLAKE2B 
030a26a1024f614fa7b19bf4e752ca6e34c3fb3014edb8755788eb205a9d51e229891cb74930b306a5bda2fa4188a9f3153b2b52636fa1f4b45a4f189a67cae0
 SHA512 
13986eb69e4fe06e27955724e8ca4a0415c5a5a1a83e98b881ab91cff5af51b88f41cff2545a30f92c149b17b082e58a0b172bb8419d39abb74d1590225b2e07
+DIST gentoo-kernel-6.6.43-1.arm64.gpkg.tar 119592960 BLAKE2B 
9c5e6262596ed8dfa5d802e2fd051ce35a1b8a6f49cb4c9ac3a61d67c166c75e8c1179aa60d9fb31c8784eabf6bbc9b82c313122eb5667169f687a44ba0e4c2d
 SHA512 
d5f0a412d2d19cc61fe303bec5978b56bbf463d35695bb361efbdbf7826d4f96377e8d74d8827a69d8b52e694f52ce4e6a1ff1aace7a4ec2967d95ccc0b97dbb
+DIST gentoo-kernel-6.6.43-1.ppc64le.gpkg.tar 64256000 BLAKE2B 
d61e154869bc1210eb477a089f2f9a4a2e857e879699c48d972443577fbd8c60c0ace0420dcd681993f505de107dccd928a114c58f8400e8de449c7a61040029
 SHA512 
bd871dd3d2fc46302bc7d6cbcf8847af114a132a3b56153a257200b43e614be21d23b90f6ae1ea39ad7c704c375cd5971f14b6991d219e756d89d4079417938d
+DIST gentoo-kernel-6.6.43-1.x86.gpkg.tar 68259840 BLAKE2B 
25dcd8c4e72838e3ba3583cf1f01f799bb92d3cb75cc8de40365b3d3954306c7dc2f87198ab068c8757d44e2701602a433747d35a3f163c8f1b3786d694f820a
 SHA512 
a312eaa4257d0b8b807d1c951cae92540cfb908aec0adedb1b36e04035a7a472f25d60a1e7fa2478cc01c9417621b2bb342b3d58302d756a88d051af73032ff0
 DIST gentoo-kernel-6.9.10-1.amd64.gpkg.tar 159416320 BLAKE2B 
2d335be253e2313e6de88cf64a21a8ff76418729f481dd67b8b3fc69bab8986cd4780e2a17a4422550c75318b02598bad0ddd704d238122d594621f5abd9e3e7
 SHA512 
52e918b4cbdd085461a09e73b887712a918f41da081331ad53dc57225933537cc72afd870adf411201b9ac4df49a500bc65479c507305ef2bbf8e714c7883f08
 DIST gentoo-kernel-6.9.10-1.arm64.gpkg.tar 130068480 BLAKE2B 
eb1455d1a444a45db4c7148c61c2be13bcfc6d723683e311a1ccba50ab0beef1f5b93f207717b25e0e1c74020ba6daa1d2c42cc70ff983038eb9ba1628567a9d
 SHA512 
a075ff588892e965ad3c1ff18cf770fa38da7ecf2769526b518088881ea1fab406ab77b5a40aa3e5c1925748fa91d3d2d1a4a8fc99df02aa711c3e5e8b371319
 DIST gentoo-kernel-6.9.10-1.ppc64le.gpkg.tar 70748160 BLAKE2B 
b3d09062b5ddf3eabff8ca1e1844eb445dd2a7a910356fb8799c38b000c7cbde64f259bf09ff6fcf6bd0b49d2ad87c9faa54581f27505dc7dd4c4f3cbfdcdb4f
 SHA512 
41b46556727e57f325e204763cc98eab0627e0bbb00eb7dd054aa9718e61fea49293ba0f858b3f47e723e914b08c0f3785892e02b6d9e9abad1119fdac758bcc

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.43.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.43.ebuild
new file mode 100644
index 000000000000..e0e46cd48882
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.43.ebuild
@@ -0,0 +1,164 @@
+# Copyright 2020-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_EFI_ZBOOT=1
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_SECUREBOOT=1
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 7 ))
+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}
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+       !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+       app-alternatives/bc
+       app-alternatives/lex
+       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="$(tc-getSTRIP)"
+               OBJCOPY="$(tc-getOBJCOPY)"
+               OBJDUMP="$(tc-getOBJDUMP)"
+
+               # we need to pass it to override colliding Gentoo envvar
+               ARCH="$(tc-arch-kernel)"
+
+               O="${WORKDIR}"/modprep
+       )
+
+       local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+       local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+       local uki="${image%/*}/uki.efi"
+       if [[ -s ${uki} ]]; then
+               # We need to extract the plain image for the test phase
+               # and USE=-generic-uki.
+               kernel-install_extract_from_uki linux "${uki}" "${image}"
+       fi
+
+       mkdir modprep || die
+       cp "${kernel_dir}/.config" modprep/ || die
+       emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+       local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+       kernel-install_test "${KPV}" \
+               "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \
+               "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+       local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+       local image="${kernel_dir}/$(dist-kernel_get_image_path)"
+       local uki="${image%/*}/uki.efi"
+       if [[ -s ${uki} ]]; then
+               # Keep the kernel image type we don't want out of install tree
+               # Replace back with placeholder
+               if use generic-uki; then
+                       > "${image}" || die
+               else
+                       > "${uki}" || die
+               fi
+       fi
+
+       # Overwrite the identifier in the prebuilt package
+       echo "${CATEGORY}/${PF}:${SLOT}" > "${kernel_dir}/dist-kernel" || die
+
+       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
+
+       # Update timestamps on all modules to ensure cleanup works correctly
+       # when switching USE=modules-compress.
+       find "${ED}/lib" -name '*.ko' -exec touch {} + || die
+
+       # Modules were already stripped before signing
+       dostrip -x /lib/modules
+       kernel-install_compress_modules
+}

Reply via email to