commit: c022848039d499da76c2464c9a94b2481141d448
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 29 12:29:35 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 29 14:04:18 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0228480
sys-kernel/gentoo-kernel-bin: Bump to 6.6.85
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.85.ebuild | 183 +++++++++++++++++++++
2 files changed, 189 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 54efc14168b5..4cfe2dc6018d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -44,6 +44,8 @@ DIST genpatches-6.6-92.base.tar.xz 4647800 BLAKE2B
05cdb4d7f661b5461a901ceefa540
DIST genpatches-6.6-92.extras.tar.xz 4056 BLAKE2B
39db4511a3cae61ec10cdf708852b4e2527a560429567fe80aea823a1571efcdfefb7a86f031662ce5460dc9191bb4f47958339345378874cd71042b7ac578fb
SHA512
34a41bd55a9ec7a6c68676b44a60949f9b79aaf43b140d7e84c12bc0f4c4c44e44528301c86510e99247149897eeee69dfee153acb00779b01fb3df4381f7516
DIST genpatches-6.6-93.base.tar.xz 4705028 BLAKE2B
1beec486187b8504bb6a1c3fe4ce56089344a473d815bc5b33d3af360eb35e56737361dd2eb6e9a97f779fa6027798e3849dc99f0280bb9b9f11da3f8624870a
SHA512
7014949210531946bd9daabcf0bda3e1c6f61a2d9c2f9534ae662d529c5ea61b838ea6634afc1473724d93d8801a9e5571549c25f04d72966b0856fe53f35ae4
DIST genpatches-6.6-93.extras.tar.xz 4056 BLAKE2B
70a19a3f034d0851fa9969029fa4fec74aaac51308b85599a58eb3d2bd15d6b19c95b402bbab1189daeacd28c465bb5381a8ea85bba42f9f66a94c7a1809a15c
SHA512
3bd068e5448cf43599708d4aa73d496b2cffc0761144071392f182c79d385d5ab402cd45e0699842f8221072a4cdf505d7f81e295fe0c30cd4d6ea7822d9b6e9
+DIST genpatches-6.6-94.base.tar.xz 4728588 BLAKE2B
63e287cf4973aa3808673a8069572ff79ca0efda0c7711df217fa44ba1d8179f355ba4f1145be2a81974922eb17b2110f31ed091fd1aa2609d2432995df9ba53
SHA512
9cd910058edb7e36a8621eb1f2d8493ad4c3db2551e3073683557be9a73b20cdf4647d7beedd2ac93b84fa126b816485372f1d8c5901bddbb83f6896dbe9a22b
+DIST genpatches-6.6-94.extras.tar.xz 4056 BLAKE2B
91ce861bb22c0e604dbc9e23fbc0a59baac8992f9c7ee1e1f3d5dbd28d3695f0621a6fc9b04af70dd16c0283af61b77d3560069b34e7b7457b3daf4db4a8e63a
SHA512
a9b0632fb4c8fe27350e28b3bda5b2c2faf539e2d063e7ff04cb901ac4610c16537cc121117e283076f07318454eef6127aa326a401f932f197575baa5ea99be
DIST gentoo-kernel-5.10.234-1.amd64.gpkg.tar 63662080 BLAKE2B
08da5926b5b7ed9a6963584c2e157725f3de773435cfc5beb50b54b477ce6b45a05d8c95fae62ea8a057516ea74bd86332566287f1e94abe09676cb1de3da76c
SHA512
8e32408115186ced223719eac7304f3d180ddf44a87bc95118d876353fe2a24b0ab2497a12396ecfcde1608891f6dc4c52d9056aa87e9b3ad0325ea451a84bd2
DIST gentoo-kernel-5.10.234-1.arm64.gpkg.tar 56842240 BLAKE2B
5fd1f3f0959afb2edc6c3a6038b10b1930726ac177dadbe50c8034ba6dc2ee830307985e4634fc4881a8f03a6c268d20ae0730ae9e3edaa902d8997b93c66323
SHA512
a0930aaa5f4107b0e87e62a4f569c74ebe2a96e6c8f7947d7cbfceae9ace9b9ab287bf984ec07a0e99c13db65f703279cfbde61b94036b28cfa473c6f318649f
DIST gentoo-kernel-5.10.234-1.ppc64le.gpkg.tar 52838400 BLAKE2B
294837fab511941bb5cc3a5e23dbd3d57b40338c6eb706cc5080123559d30b5b1f6bbb5ed6983bccc7ed8904fb1e03ff38d111153e9612ca06e772896eb11ef9
SHA512
65ac1f9f14b51adb1f32935c3d92fe32724d7b87b61d209f9966f25c312f93005fa12ae1cc6fba064a0692471476a67803c41da8e19cf8c713616bce64f4bfe6
@@ -135,6 +137,10 @@ DIST gentoo-kernel-6.6.84-1.amd64.gpkg.tar 273459200
BLAKE2B b96686fd5007099bc9b
DIST gentoo-kernel-6.6.84-1.arm64.gpkg.tar 246302720 BLAKE2B
4c4dc6f3d52c5ee6bce3d5b075faadcf2983a84dba7b7b5aa4325a167db185cd22ccb5d5e322342bcc98fdb392d036c8178de68a95f7d4be1c6b65dc900b87aa
SHA512
ba20033aa1c84ce0250356dc4c17958f1040f124be82d1e400d5a4b2a528280e0f30dbacada6a6dbfa0d1ee5b61965781fc11289f998103b73fb4b4be897b9ba
DIST gentoo-kernel-6.6.84-1.ppc64le.gpkg.tar 64419840 BLAKE2B
a590e5c4af9119e34cc75d401e6663016180283260cebe3bfd6cca700ab6079a9c839ea6a957765951b3dd58564247a52c30017160eaeea8c06161afaab9c400
SHA512
b2d7a5515319300790fa45b80943fc6cfa0c44a79fb03264eb1ef0d81da4a29e67654414730e46ce614fc344be6060d4a5643d8f661569f079b50493e7aad8bb
DIST gentoo-kernel-6.6.84-1.x86.gpkg.tar 68628480 BLAKE2B
f82cbe2a627fbae11a6efff88fb3e35bc4e31ecc1d21880d359bfe6d5991fdf2eef46fb3e2745b95761d218e73bddc6fdb422f9c58ae8867df26a1fbb2ee5123
SHA512
9c82084b4337362a8d5cc8bd907f139fcadc1578964bd32b54b8e3ef1e4d9ab67f4c7035dc406c2d0a8d158438289e568c0fa9ec8bc0f411ab36a483b9bd36f6
+DIST gentoo-kernel-6.6.85-1.amd64.gpkg.tar 273459200 BLAKE2B
77163f000eb2ba7ba6afb9ac81e8f6f114a8401707a33ce1af1f787bf891e2dff92d74d57043cc8b16c2f83570d93d01e6364d7be854273f92fb130185e25b98
SHA512
9af07d1daead4b49544b57f1b30836538f86cd303bbc08f5e3fb4f23cc49cc2b496c6f0bde5546279cc5d0b6c067a6971fb2f90d40842777f9fa0eca3c9fb14e
+DIST gentoo-kernel-6.6.85-1.arm64.gpkg.tar 246292480 BLAKE2B
a3db12f0125e55a9af4d227848397b259418c9aae6ca15e88b50d1f54901a836543537ee991bf35d9c07ba35a4e3e0dd1f118d5879fc4e798ad120715924b914
SHA512
0eb02919d964639733875c3e1402f3c7a54251c678a12288ec8863545bb0c739b050a6648b04fa00884fa4d6a82d1df452e81c52cc38ad1f64a64157e88cb529
+DIST gentoo-kernel-6.6.85-1.ppc64le.gpkg.tar 64430080 BLAKE2B
52082ced8fc59daf2a95dcd924273b7987e814f6cd68e18e6e9412cbe80401c224088763d10c72dcc993c7a33fe0e6518bb9990c7d3315f45adbecef05538f99
SHA512
cea21d9a9533b6d55b4aacc11d3b4b25d8f297969fcb717ced2f6165f7f493d3e350a254d74f8fd3372d700608dee2f380a7aa62d21f507db2dbac76dba9dde7
+DIST gentoo-kernel-6.6.85-1.x86.gpkg.tar 68628480 BLAKE2B
936c40a022cc98b9771c8f53e272b5a5c5b3a4743c93260ff1427cd74543331481b89bdb3a8dfb6aee2c46b5e1d2622498e38636530a512a3bc73bc41c8b5e29
SHA512
bbcd96b22904bc9151ca17fc1c8e4e26148c9f9fa11e140e947a3e20ac7dc3e9cfe748be07fcc84f0903f6d72b15e92f5b2a5785d30cf52be454b751f8323abf
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.85.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.85.ebuild
new file mode 100644
index 000000000000..7ffb1f6159f9
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.85.ebuild
@@ -0,0 +1,183 @@
+# Copyright 2020-2025 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##*.} + 9 ))
+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
+ amd64? ( app-crypt/sbsigntools )
+ arm64? ( app-crypt/sbsigntools )
+"
+
+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
+
+ # 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
+}
