commit: 23806b035676883716a83f65df3964622e516a85
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 19 03:08:30 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 19 03:12:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23806b03
sys-kernel/gentoo-kernel-bin: Bump to 6.6.52
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.52.ebuild | 170 +++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 4532f4d24241..ff4392ac61b4 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -42,6 +42,8 @@ DIST genpatches-6.6-57.base.tar.xz 3079200 BLAKE2B
d0f16f9b2f09f182c02fdb6cfa4b7
DIST genpatches-6.6-57.extras.tar.xz 4056 BLAKE2B
9b071880383921fcc8cd2da092e1219e3b40684e6ffd04bd2ab75fd53624cdcb7289f1c40ae9256e0343bbea92393c153724ee628e8d164596ba4d7f8bb413df
SHA512
a61cbf855e718ca7afed0b15614ad2e9bea740412e8251b35417d10f4b936364cc3820951acc45be2b18cba635cd1c43da8caeb4ac315747d02201be39148c8b
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
+DIST genpatches-6.6-59.extras.tar.xz 4056 BLAKE2B
8d68a426082bcb168f74abb849a7a58090268c9cf098aa8982d9e700fab754a6f42dd833c1ee5d44d52f58d1a6b3da018a954d873ba131a2049a286a39ca3099
SHA512
ee133a7efaeba2abe242482825f4490e1c1b17fca64f9183713dca601fc64048288aa79125f7b8c0715f6c4fb158ea3a230e76b39b63d1a59dbecf80697ac000
DIST gentoo-kernel-5.10.224-1.amd64.gpkg.tar 63283200 BLAKE2B
14061a7a4219278bce3237f8d59015448fea6e195a02d8f5a1d63f41b0ed0d189febd0964a082eca1948f57cef5a4e96c569d26f0c1b70855cf447073f1bfbfa
SHA512
e4e7f4bbf6750ec216ca46408919b5a37aac372a14a7d73eee1b44df2ed2a0607c510db1109db117c25bb94dd331fffbdfe380941661bec94f3cfacdf858e929
DIST gentoo-kernel-5.10.224-1.arm64.gpkg.tar 56750080 BLAKE2B
2b31d7121e82bd500260b26fc795d0d59ecd1328fb1ae0b202ed24a5d1a41947b4b4a84db0172dcc76f6ffda4c5e3a63527e5d2156148ac673305bd57bbc1c4c
SHA512
1e0a6ca9cf082b3aa9f386ff234f96d3711ae2cab36791be38077b9d5c80ed5448d092bea453f249cbc3cb486206a614e33f26de3181666b18aac47364fb604a
DIST gentoo-kernel-5.10.224-1.ppc64le.gpkg.tar 52766720 BLAKE2B
789dc4f675dd22f391262f4abe1b89d60fe03b9b48a93643b1151f00765c23c470188e727cc437434a950b37cea22c237f9afc82304dcc57f649bc91ed0bc108
SHA512
18034bee9a75ce37a6337ccc7952c1eed4e0a600414a99e9c7465a1cb0619500238fa241e02e0cb0a37feeab9634ba4dd6d9c87c46fde93765e3b4983d455500
@@ -130,6 +132,10 @@ DIST gentoo-kernel-6.6.51-1.amd64.gpkg.tar 149657600
BLAKE2B fc159a5336426c45fef
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
DIST gentoo-kernel-6.6.51-1.x86.gpkg.tar 68290560 BLAKE2B
94bb65e8e37aed1319b7c5961fd1b536e0d7493905d53fd09700cca9445a80bfb8b8d46f53ac44b2c43e5b8d5e7fa95f3fd888aa86964ed8ca0bd1eb79ba0e2b
SHA512
2344aab56acf78f357b25e95f25dcf29b4b6f42a3b3cfe63a11673fc1932db8f6361cfbca413c59d9d756a60021de6d7e0ef1dd4e2ffcaaf47e341cb045da447
+DIST gentoo-kernel-6.6.52-1.amd64.gpkg.tar 149647360 BLAKE2B
01a1b97fec61f0ed67ed33823092224e89f8816b8a217d89852dc3f76515b1b305f3d2264df815aeb324c7fa6b901d1643bf4ed8b34a0acd3c0fc4b9fbcb7f84
SHA512
6c818c48c89144b71f03bb6d2f99febaf5cb593fd340e2b6445aab82c3ec02d1af4e8d7a28aa1c99b71d674de4639754b41645b7eddcf2fd98330c44e950f7a0
+DIST gentoo-kernel-6.6.52-1.arm64.gpkg.tar 119715840 BLAKE2B
29e3adae14c15aefc7317a5a3074554116e75c3e4a752dce934f91b6b69466d9a8670e2916e34b0ca3e9267a5047a7ec8a1114e8e9eb38d9109358db9c9c54a1
SHA512
22a99e41b361e83a50209cfad36927651d2b74acaea5307ae7e784c07cdc4f208b34aab3dcd931eb1818dd704afa3034d1b75e3bcefd7fff133c03b9af7f1fd4
+DIST gentoo-kernel-6.6.52-1.ppc64le.gpkg.tar 64276480 BLAKE2B
1025401e8c36bfc84595aae09b639c1bf3ae9eb1d336f7fc61807e4e3f7811c6f2937918bbe18f20ce4fb5e2cc19e09858fae685d751a91a4ceefbeccef2e312
SHA512
2be94eeef0d5dfbafef0ebd03488918d744cf0e0abf42fd4b58b6e90b6b43941226c19610da7ee2dee9218739c0351b2261b5d611f5999b2a634cc233491f043
+DIST gentoo-kernel-6.6.52-1.x86.gpkg.tar 68290560 BLAKE2B
15936c7642eec38676fea6212e6d43349c196405c3d2cb176eff57fe46345f548febd44fd26b15eb44f17c4cda85e2ba3a68eea7a9bc3947a67cff06b3d22ed5
SHA512
85d84144e4e2388219c769143d1f6de8699e1cfb2650c0aa083c0edddd40786fdee986230877c9fcc9e8a4ba73030d385776ce7e73aa390275a05c6c585d9246
DIST linux-5.10.tar.xz 116606704 BLAKE2B
b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1
SHA512
95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
DIST linux-5.15.tar.xz 121913744 BLAKE2B
3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83
SHA512
d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
DIST linux-6.1.tar.xz 134728520 BLAKE2B
ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e
SHA512
6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.52.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.52.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.52.ebuild
@@ -0,0 +1,170 @@
+# 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 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
+}
