commit: aac06c61e496a2395c14426aaad74677b39d9cdf
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 30 19:54:51 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Oct 1 03:06:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aac06c61
sys-kernel/gentoo-kernel-bin: Bump to 6.10.12
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.10.12.ebuild | 172 +++++++++++++++++++++
2 files changed, 178 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 4526fad26ae5..10cb6483cb2b 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -8,6 +8,8 @@ DIST genpatches-6.1-121.base.tar.xz 6065048 BLAKE2B
ef60651e53c53c2e918da2c9dd47
DIST genpatches-6.1-121.extras.tar.xz 4056 BLAKE2B
23ddf1bf6ee9d2790e952777edaa577916af9897a957c4e2f4714421ad7aae213b82e1c7d7b911a65f3ee6b27cefee4b5839d14ef1b0e539fe86d91722d0295c
SHA512
95d167e2d5f8e883136923b332e662e8475043e0b2324b06a3e718a2bfb7e8f7b87c1cf0961ee06b0cff7fcae1e1dbf7446812fab7237416c281033f6777cc49
DIST genpatches-6.10-14.base.tar.xz 759584 BLAKE2B
d08dc14d5126e73155a6b1977ce2b9790a5717b6bf1fa31309838c3884a81baf945661093da2e3f69bf892f472db60defe1a001afa4b9a6846deee11cdf6cec2
SHA512
6e41093c8ee9690ec279a3f35c01d058ef02c3a9eac7b9eaa3908c14463c8d3c85497665b875111fd1a29e8d406706aa6f6791a44e0bc31d8c51053259a18d87
DIST genpatches-6.10-14.extras.tar.xz 4056 BLAKE2B
63d33a29efc77a7839f4961de62c54f2383bcc7a119fce5ca7f80cdb66515537bb1e1bd55bb50f297b8f0a9c74f75bb237ee2893a859abe6d7f05864ae21e38b
SHA512
c9adea40fdfd3faa5ee24a60be9ad4444819a8fbcb417ea98ce2f7a02fdd1e70c6f1168380cf6efd5a4d1820bea14db48c3064b271afaad8e1d23f0a8263a48f
+DIST genpatches-6.10-15.base.tar.xz 774884 BLAKE2B
e5363896fadb615a40b43b90c4146f93aee696c0aeff3ceee6a8d60882112f90b8bb1df838a827353d290cfb37aada5b53b673cc21dc611e774a4b7376fd12ad
SHA512
dc45ee28cad09a1ea2005e6eed656b4fbe7e9d291571583eaa57388b0b3d08f769bf10752aeb7a519dfd1bad679bf277114fafe49c8243f78b9bd7548935a21f
+DIST genpatches-6.10-15.extras.tar.xz 4056 BLAKE2B
c80ea0b763a9c37e6f3aa5192b712c0acc7849be3dab66c911b175af94a8e8b22afc7cb56a10f7fcd91a34e0ff5d295abebfbfd5de260f86c800e3227a3c651b
SHA512
7e50e426d10736a8d3fb51180d58e434097b70b9675bc23b89539834a09ed343772764945925a2e556b1140af8561fa7231622513f185fdaacb81d7763dd6d02
DIST genpatches-6.6-58.base.tar.xz 3154204 BLAKE2B
5b9456e93cb0984599e065fab0d05e40b7efbc8079763ede75ed7a6e7f0e241de96f0c6438cde52f64a5074f5bfcc5d55b5d3c21a9e9528138ea5c36e164ea58
SHA512
e775ac64564c201c3e1293d34a70f347a5afd5691a006d958f69959d2eea0af690cf66f7bdd450034ef9eb43daeccbedd58819dc688cd3e7e9933da9312cbf75
DIST genpatches-6.6-58.extras.tar.xz 4060 BLAKE2B
7e16c5d713aaf221335b81f3a301e9bb1e7f243d9bc6739c3dd07bb3cfedbe6bd5a763ce418172c838fbd3de82909cabff7c2e5c4b4f1b675098b709ddc5203e
SHA512
315bfdf633398b3b1a9650dae88fdd0c1442336cabe45a3f2722e968f510da13050657e8d35acf8a313981bd9403f5056abea182a0115a79952a2740ceb4ff88
DIST genpatches-6.6-59.base.tar.xz 3174716 BLAKE2B
8eded8d4d4c343869f587ecc2a218d124c34618494ded9d17b493f26894e545658021ad9cfa05bafd14389de07406f43a722c37276cc14096a3a7a00040e2ae7
SHA512
88e5ef8de0954f349e5c0745adb8f718dcabcd2e166c597c9de753c892eaad42c936984279fde86974b307858959cdef401f92f6f62a98bf1d4bed14cbff821e
@@ -32,6 +34,10 @@ DIST gentoo-kernel-6.10.11-1.amd64.gpkg.tar 288471040
BLAKE2B 7015cbaf2b47d62f51
DIST gentoo-kernel-6.10.11-1.arm64.gpkg.tar 264816640 BLAKE2B
412355b2787647c1960f643c90d06f739fb9c7d2dc655f77f1c8c90d2f83b1a86a01a034dfae05323014f8bc72ce897fbafe42470213f565f26b4c757ebacbb5
SHA512
63fa9896ebd67aea2596186151e577d1071688001798bb889d61ebe91ec8db0f52d1aac7ba3b7c44d59d302a2331a696c0875f6fb9daa4eba4182d2790450812
DIST gentoo-kernel-6.10.11-1.ppc64le.gpkg.tar 72017920 BLAKE2B
e735783122186d2036ad6c5ab8bb4e3cf3d16093ae793d5b7295ecc5b250f9b07430ef5fc42e67f4da69023c11b3c9f6874254dcf922ca006358ff2458c3e383
SHA512
19c8e6e1c23eb767a18fa392dfa5a5a9cd67636221037fd4becb07f375afd851607886dc7a4c8231406c7be99961e4bd4c2a8fc1477fdf484c4c43c12842eab9
DIST gentoo-kernel-6.10.11-1.x86.gpkg.tar 75560960 BLAKE2B
f205aed0cbcfc3e4300a17e6675d0bd7e97c959030bceccfb533d72918b4baaf22b42e3ea55363282bd657b87a79de6c5689b5f666febc0cc8f33e33f6c718a9
SHA512
f02e4ea6ac8350e73d238864564c86583eb2d3d5e91cfe564443985151cd9d26110cf0e00aa6e584e35d68991aaf53e6cfe412f52b8978968465a8ab2b51a342
+DIST gentoo-kernel-6.10.12-1.amd64.gpkg.tar 288706560 BLAKE2B
d83eecc007178709e4dc965dd25e9f4af7790b99502e97c4a11bb9931fce5f19fcd987acf7bc42417789d16530117a7cd21bbb77cc127f45647282666510e6d4
SHA512
3b0c48c70c83c64e95af92109bfc3be48c7cc2bafb9f2b82fd551615069d4c50dfb52b978810f27388d0c59c6f38b0fccd9b39c8f9126614deccf235037ed75a
+DIST gentoo-kernel-6.10.12-1.arm64.gpkg.tar 264785920 BLAKE2B
c6a373bad4f8d1b9c486837e3bda52d4dbfb20606c46910770028c55d8f5c0d4fb3fd4c8aeb6ee62a5e31ae97d4bb584ada4bd066eae629466c4061fe24e4413
SHA512
e3a5f4420e9ac67ea5c5eee354716459fb1b0b859ff1def1b951f27b7ef8f9a5fb9382e28f951dc6cc7f9ae7551e27bc907752bd8a4ead34767510e529c92aa9
+DIST gentoo-kernel-6.10.12-1.ppc64le.gpkg.tar 72038400 BLAKE2B
906f436a142970c300f86034c1edb5e5765af7f9ee1a1534c0cda48cf62b5c53e5779ccc68117b71ff483a921dc1403f6e7d52d30b614a354b141b0872903b1a
SHA512
8bd83e9d29d3b820e5a27b22666b55cff8a8ab5d0c2b86d698deb6340100238d81ba01a35892e7c2275595a429609fc9a55d7aca526bf41e6d11a37af0ba4155
+DIST gentoo-kernel-6.10.12-1.x86.gpkg.tar 75540480 BLAKE2B
97564b6d37a61cbf486c481446a998d616b1d6d56d2f28f1342fdfdb6aadb65c2b29545d31e13367fa3a46dd9fa700ba929183f432aa5da740a535d7c4ee803d
SHA512
deeb141ef8c5c6512fca01ed5c8d33a0bbd3bace4a3a336fad057cd0e343f9bafebb83e6ee5953dbdb2368f56b57359f1283932a1ca2ee20daf64aacd8392e9c
DIST gentoo-kernel-6.6.51-1.amd64.gpkg.tar 149657600 BLAKE2B
fc159a5336426c45fef12d01a399d73c397b945bbe9e628c65378a5a62d82b9f27831f748a987c0f5c36d15d14250e7817dc3b30978a299d75fa29398398228b
SHA512
becec3093881a45a8cdf6903c02c3c6acc453434990da02707832a09d4a13815fbfe348016fc280424245b7f04415edec7155a7bdad5a4e4af11d823f7efb16b
DIST gentoo-kernel-6.6.51-1.arm64.gpkg.tar 119715840 BLAKE2B
d7056f38de6c4601829768e01dafcfc16d46786f54a68d022280b993d6a307ed9620c9ff2ba5b98c1934b79bebf9208a79b7400be89ca21e8d41be0d5cb4ceef
SHA512
2493c75d7958ea17fa8fbe7cef00699f83c46eb6aeb7795fadaca0ed5434306a19d4e4d6f74dae6c5c56db6890a9c85dc0b8fcbe1a67d1a95bed6800d00e2f4a
DIST gentoo-kernel-6.6.51-1.ppc64le.gpkg.tar 64276480 BLAKE2B
728cde54c79ad1e59af44445f934eb0d032e832821780e047bf86d6d9677522e65f09fcfd90b7a662624a8ebb7f1f35df192a5b56a06aaadec2e0b07c11b7422
SHA512
bc0b82cfb31228d6c549a41dcce9a37ae28fa76aab086ae0c50678832b85510bf31d4fa2aabee6d681d40fa0d44ad5549ae1bdab34f6be3c5803b6e5cc712f62
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.12.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.12.ebuild
new file mode 100644
index 000000000000..d5c4f186a89c
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.12.ebuild
@@ -0,0 +1,172 @@
+# 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 ))
+# XXX: Change me back to PF afer 6.10.8-r1
+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/-2/-1}.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
+ 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 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
+}
