commit: b46ea777f29e796a9312a0d26a16286c8f4cd275
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 12 18:21:54 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 12 18:21:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b46ea777
sys-kernel/gentoo-kernel-bin: Bump to 6.6.51
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.51.ebuild | 170 +++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index ebb51c6c0599..6eb465655dfa 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.6-56.base.tar.xz 3040548 BLAKE2B
751529aa9bdd2aa696fb367cc2afd
DIST genpatches-6.6-56.extras.tar.xz 4056 BLAKE2B
d54da14f3afefdb9aa8c6597913f37c5d1314e4a93216608bee52a52bcc05924bfadf2d5e7e49b0488159b0a57942f1579a4e7b3fcdc90a78c10e0efffb6a1ed
SHA512
ba961d5434222ecd618cb44b08ec6413d98c1d1958af2712065d924370141f789ebb315dc53a5bdbb75d3cbe86cf719983e66a58d537eb78455eda509689aa73
DIST genpatches-6.6-57.base.tar.xz 3079200 BLAKE2B
d0f16f9b2f09f182c02fdb6cfa4b76f3d9d41f22b149d50faff129daa677b97830128a40c8c2f98b2534b722865b49b8a60b5f205b7d3284ef94a67946a4b460
SHA512
c6d16e6d814d363f0e34f3e7d569757f787340889f395ef9b3a273582a3d72d60b692e872764e5f411ac9a8648d886c9f6522342c238a421e423b2cd0e6b40fa
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 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
@@ -100,6 +102,10 @@ DIST gentoo-kernel-6.6.50-1.amd64.gpkg.tar 149637120
BLAKE2B eb86ec35ce239e6a4ee
DIST gentoo-kernel-6.6.50-1.arm64.gpkg.tar 119705600 BLAKE2B
327bc89a6621bd0ec4c69921a074c0f7e8e844321153d2621aef82ac112f16bececc321738c0281fd5e6fd20b44848a4c860b94a2b9a613b1e84f6095b1d8884
SHA512
8a198c3e530a231bfb6c22567e5a1dce7dbc486d9bddf9fffdc503c230b1cf1e5f280005c2da7f80f960018b18e3bcb49d7bcf6312d23069d68c45b4b7f478fe
DIST gentoo-kernel-6.6.50-1.ppc64le.gpkg.tar 64266240 BLAKE2B
5226f7cc78dc9c2937486842b25c767533336864bf3a9c00476fd2c99ef4cd326aff01ca4bf91cef391922dfdbe140497066a05fdec955a55f264960edda4904
SHA512
170987192a9df6bb596895cd957f025036daefcad5f2fd40d3d6251799f9389fec9013df5e8c8c1e774ad4fc10c4ea541400b770a6ba705e84bbfd180f4c9f10
DIST gentoo-kernel-6.6.50-1.x86.gpkg.tar 68290560 BLAKE2B
6e373280c462d3e852342eeff79198b42bb722feb2d6db69d3d9decae20f5660c9feaea3177a1a14010ba5c74dff8aec681a35ebac6c02d013b89fe756a96261
SHA512
2f2e9a90efaa7690774400b673318137d6db9a62390b28d35cee9a95519947b4a548c302058dce1cb4869600884ba4059714134b1d6b0633c93d8c911e137a40
+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
+DIST gentoo-kernel-6.6.51-1.x86.gpkg.tar 68290560 BLAKE2B
94bb65e8e37aed1319b7c5961fd1b536e0d7493905d53fd09700cca9445a80bfb8b8d46f53ac44b2c43e5b8d5e7fa95f3fd888aa86964ed8ca0bd1eb79ba0e2b
SHA512
2344aab56acf78f357b25e95f25dcf29b4b6f42a3b3cfe63a11673fc1932db8f6361cfbca413c59d9d756a60021de6d7e0ef1dd4e2ffcaaf47e341cb045da447
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.51.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.51.ebuild
new file mode 100644
index 000000000000..7ae1d1d9fbe0
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.51.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
+}
