commit: 78b44e77cc8e61a5b8ad96193f0b3808e89dca47
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 27 17:17:08 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 27 17:57:02 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78b44e77
sys-kernel/gentoo-kernel-bin: Bump to 6.12.7
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.12.7.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 7703f806805c..cf62f8bf8c8c 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -22,6 +22,8 @@ DIST genpatches-6.11-12.base.tar.xz 809756 BLAKE2B
16a87065f9bef4016c3a19cc4e4eb
DIST genpatches-6.11-12.extras.tar.xz 4060 BLAKE2B
69daca4ed6c2f293f04ece77003f2040b7fbe3a28b80eaa3e7aad8ac65adaec303b433634106b5041d597c33163624a447bddbbf889121c9b917d987febe0bb4
SHA512
33db2d06b7bae72153d24d7dbb21a7459f2010ac9176ca4c3356b01c933f3d61379fe2c307981c66433d3a997d059cb3bb2956d8fea8ffffe7eb0c33bd4b0a5b
DIST genpatches-6.11-13.base.tar.xz 1057764 BLAKE2B
af456ba89688ebaf57a0921c3046c4db1d5a83ae5133a5b4721e7521ad72fa2d6d0e44666b22b4b0e3a05c0ee9b45b27a528e8f5e64282d8e48a0f1bf14ac046
SHA512
911558be25d367062afd84df97a3bf01e32fc976c0492c9dbd8010b3ad3d6bc1ec3c14e9d2322bbcb7f7da0eff54e1d0ef0dbb822778e869cf5730602508d433
DIST genpatches-6.11-13.extras.tar.xz 4056 BLAKE2B
c03fd34ce154442a7e5d786d554a5996dd90ada4cc302aca88a00573e4eb3ee4c5cdbe765aee0cbf1a874b5be0dd2f03bde9d50da53f3e62dd0e3e9dc0560a66
SHA512
d8b42dad1b61ea53b83e283fa0abd3cbd6e28f062047b51b3fb0339f1fea650d0ca386ad5848e9a6407006f886f1ef6107f79c179096e63bd968828428aa7652
+DIST genpatches-6.12-10.base.tar.xz 680556 BLAKE2B
1e8b7fc1e380a238f2d3eb9778e0632a3d8d2a9fd59578c866b80d0f6d8452e737aecd3a443f576c9df434d2a81968be7382006db2ca032c9253168bb4463633
SHA512
f5a3dfe69b2dc0517f29a019b20abda79e608bdba568e838c1ceb8d26613fd7536c30f5f92336820a2cf33e89e7470455333b530292e0b63590e2def4d089147
+DIST genpatches-6.12-10.extras.tar.xz 4060 BLAKE2B
9cf7abbfb23624ba1acd2c7fa972154d9c66bcba6e9170c9ba860f7370263cc9c8fa2dce8f1d663bdd10f2f95539a91f1c1f6e914c3a0bffae641c6c73cbec54
SHA512
cf3dc0120d4048cce2f2eb7f105cdeb9c70a95381518523bcbd8df126ad8fb5035b1d6862bd01f5530830e74f27d1a64f8c999382aeca327e80f385b7bb9ceb5
DIST genpatches-6.12-2.base.tar.xz 6548 BLAKE2B
6872ca3238aa7b9e811ce827260330850fd90bb3bb48abe7a06c5fd36acfff7ceca5983aff7cdc82da2396e27b908cb737ab77c5efc9603d03193473236ef634
SHA512
baae1ebc693f5eebb308d35d8e6571f5f00e95bd98e4aac9c84e6fceffd051b4699762dc5c1f1b02231126e7c4bafbb352e4aa011cfa71d9b0ba84fbfa766536
DIST genpatches-6.12-2.extras.tar.xz 4060 BLAKE2B
ce854b442562d86627eed172c94d6766ed27a29e0c7cbd240ec7b18b3fb0965a30289640d828b603eb309f2e911dec157c206740b4f16f40ffc3ce8069fabf3e
SHA512
dd14190aaf8dfd51696e0fd3751695889e9c4c6ac9eb36b288f5991f01874b3cafb29240fa115fe54b718ee741c810c154e97aad8f5eb72f988bb3bae0005222
DIST genpatches-6.12-5.base.tar.xz 331136 BLAKE2B
6af9e74cc62063482672566432da6173b605d67ed0555ca1486cc0ffde606d84446c40d832276a9ee2a6d2584aae4a8de22a186a2c5b68ced840135b87b37457
SHA512
4b6f205a9fef89118e408e492b179289338e9453563dc95746826f71f5c995d4b36ca14ff106ef5ed6112f5d8dcf6992c7e368ab8ad3fd682c9c0219956ff02e
@@ -112,6 +114,10 @@ DIST gentoo-kernel-6.12.6-1.amd64.gpkg.tar 298731520
BLAKE2B c60be1f40d2e5aeff7f
DIST gentoo-kernel-6.12.6-1.arm64.gpkg.tar 272844800 BLAKE2B
d8ec3882e1d555a2deb718d84551b9405fd28a62995278085320aebf010e569e1178f1237116e8d40274c86b17b02b1aa20eab1578e415e4eb750e9b6cec53fd
SHA512
4454921c676af1396155f9984df1cc6033b14d7aae63c5f91107b107a41214482c7543eda7f8caa25ad81455543f7473da4947d9647b2092b1775c41b7e5f100
DIST gentoo-kernel-6.12.6-1.ppc64le.gpkg.tar 73093120 BLAKE2B
a006f8122a2649280972725c9854292174978a162ad3fa0a9f642113399294d329aea4e752b460cfdbf861264d0b0e58d9e4433cc0297f1b1507b293a33c15eb
SHA512
b87c5b80aa35e1f4063a6346c32771c67fa03164f092314a330034df5eedb3cb4b80c9d3c970d45a41bf094f197fd6d10f9a0da463c27a7a104199b61eaa2069
DIST gentoo-kernel-6.12.6-1.x86.gpkg.tar 77383680 BLAKE2B
2d9ca189b4bdd90bb127cba8cac5ac6e8be4401dc180adf76ed0c57760d882a3bfd055593b733e55b997d7707819abc8f78c77456f3569b640e6efb1ff26407f
SHA512
ada08a6ae680d907b675097b4cf3a2953bdc667faea673c317be1c8b91ac4fbd86c332b8408d9d6749c497ab055641069e7bcb801e3ad8f67e5a36fd9eb1d596
+DIST gentoo-kernel-6.12.7-1.amd64.gpkg.tar 298915840 BLAKE2B
c4af62bc39de09dd063495bf6d5cca7efd8364b49b797bf90a89af4a049e255ebf3ad6406df4fdc1645e75eb4778f9cc4029b63c343b469b1129a33579c2f598
SHA512
7ae48ee72fbe878f408b753ad97b60cf0c46ee80f098835acfae5cefbb81a4c349945bcdbaa70df9962b8827732a244ee795d1e11d35e5b3d255532057bffde0
+DIST gentoo-kernel-6.12.7-1.arm64.gpkg.tar 272957440 BLAKE2B
0b912595630b087c7e1edfdb91798f2514d2b20869fe526f5e1b759ae6a02156050a435037ef58583049a41d9d392a7618f935d36d0bd11570bc588b5f9b6329
SHA512
0e420669ba619d67e65f6a477f36420fa924341819b31f047ae6d707c43b3f5c955c63faf37b48754dbf852e50c5049b19f0a5cf4e7bbbc4beb4895cf67d9e69
+DIST gentoo-kernel-6.12.7-1.ppc64le.gpkg.tar 73072640 BLAKE2B
d9914726e39a58047931ff6ad75e79e6b1c5307a32da26e0d3a5b0235d94c15dd3489bd7b586eda0fc4c73512f8f429bdb700494dc5cc3675dd0b3ce4d51aec4
SHA512
a82245ba62d8779546e5c51f1900aaaabaf7f01fb0ff74f0c6a2754b56724c554268e82254ccd6ee87705dd32a076365075211e61afab38c278d017b3d57fab6
+DIST gentoo-kernel-6.12.7-1.x86.gpkg.tar 77383680 BLAKE2B
2cf9eb6ad930b6aceb530abc9105360d0f21a936131f950b0be18355fc63ddb42dd832be5a46588402b7318746af33884a70fddb9409a37d6aa071051e6d5f23
SHA512
1ce355979c6402b05fee51dd17c61deb177e12b289dae7c2f02e3ae829ccbd9566b65df5ae1b81d51270aebf66d116103d83966c23ca14cc5550adafadae00f9
DIST gentoo-kernel-6.6.62-1.amd64.gpkg.tar 266598400 BLAKE2B
f02bf7a4a53b025a1c2da579f73f3b0222e0c1b06deb3657b39e70103bf2ff0ef5e56386b70ae70a0d6822f41626e574f620e1901d46a752c3d3cfdffac70318
SHA512
8a62586c680c0d0dfd3f498dca24292ef337797adb15aa200f2964cc37624cb2dfb537ddf42036640ff46237749d1313f1a8724169a78ed958f2e99f5d530ddc
DIST gentoo-kernel-6.6.62-1.arm64.gpkg.tar 241633280 BLAKE2B
67f10267c5f7bbbd436c7fa44f1f0e9dac83262f58c3b297a681d8769c1d0577123b4cc3c45283aaf94eb3dc14189c90207d0415ea174737f7eec12688bf1f4e
SHA512
6933a49baa988b84171cb4a6a1849c1f115cae4d09715f2d450fed9a8e2808a1c86b4af67545554ad91992d77eb06196ce1b395f6749f9547e01bd63f157a827
DIST gentoo-kernel-6.6.62-1.ppc64le.gpkg.tar 64327680 BLAKE2B
7bb24f2f5d97446baaf70f15ad2f8437057274f371569caa7dda12c0e31de8be168422623d685609c37ef532b8b67dbc6c90aecbc561e7e86c66ca46945962bb
SHA512
4936c616f77f1bd1a728778722207d298e7c596cfc4e35c0f3ce703ae4282e7ccce274762183a81cfa2feaadb456d4467a87a87c191abb3c72d3da5a498cb297
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild
new file mode 100644
index 000000000000..bb92381f7d2b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.12.7.ebuild
@@ -0,0 +1,182 @@
+# 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##*.} + 3 ))
+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"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+ app-alternatives/bc
+ app-alternatives/lex
+ dev-util/pahole
+ 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 HOSTLD="$(tc-getBUILD_LD)"
+ if type -P "${HOSTLD}.bfd" &>/dev/null; then
+ HOSTLD+=.bfd
+ fi
+ 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)"
+ HOSTLD="${HOSTLD}"
+ HOSTAR="$(tc-getBUILD_AR)"
+ 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)"
+ READELF="$(tc-getREADELF)"
+
+ # 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 rel_kernel_dir=/usr/src/linux-${KPV}
+ local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+ 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}${rel_kernel_dir}"/ || 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
+
+ # Mirror the logic from kernel-build_src_install, for architectures
+ # where USE=debug is used.
+ if use ppc64; then
+ dostrip -x "${rel_kernel_dir}/$(dist-kernel_get_image_path)"
+ elif use debug && { use amd64 || use arm64; }; then
+ dostrip -x "${rel_kernel_dir}/vmlinux"
+ dostrip -x "${rel_kernel_dir}/vmlinux.ctfa"
+ fi
+}
