[gentoo-commits] repo/gentoo:master commit in: sys-kernel/gentoo-kernel-bin/

["Michał Górny" <mgorny@gentoo.org>]

commit:     1c80ce05aa3de8854f5c065a10fbe519a8dc4a69
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 20 07:19:45 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Dec 20 08:23:17 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1c80ce05

sys-kernel/gentoo-kernel-bin: Bump to 6.6.67

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   6 +
 .../gentoo-kernel-bin-6.6.67.ebuild                | 181 +++++++++++++++++++++
 2 files changed, 187 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 40d004750dca..61a706b44ac7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -36,6 +36,8 @@ DIST genpatches-6.6-73.base.tar.xz 3928696 BLAKE2B c5955b4fd604c01e2056f167a4e45
 DIST genpatches-6.6-73.extras.tar.xz 4056 BLAKE2B 7258b54caee92901aef45569d8d45d218640095b622e0106a0cd640d13fb0c377e9dc51271e5d652922ac250c74e99d091a668cad526d30821e4db676f8314cd SHA512 7b6995087d0f94c7f2cfec46090208bfd36cfee60dd26343cdc108a3e2e1ffb2e906f1e990cacde1f72d5b920a8746d4740f64c64bf39a8dfdae33949a35acac
 DIST genpatches-6.6-74.base.tar.xz 4055280 BLAKE2B 448044e3dd03bc4fdf50e99985b5d3907c0753969b3d3a7e1fbe52859c658b80f06f90cfa42172e132df6989ac8d56a9e638cd11618dca2671de188b792c2e03 SHA512 bb00296da7f6e87eb9f4897cb5bd705ed4fb15caf6664c19f4f3b3f054f767f6b561037d99281068124f7db31d65d933af2a3ed90c488ac9d2ebb0370a3ed8b2
 DIST genpatches-6.6-74.extras.tar.xz 4056 BLAKE2B b706064bb40312b20005f2fc3d1f364789d8ab94c6b6893517098dfbfc18f9f51a5336ba492133f28f87daaeb5bd714dd4720b4cdcd2e50f60c0df330a6d23c6 SHA512 a113206e1c5cca4177b537a68b496721e6f51473967ee690e7a1301b285b73a1a1bd279f8df6c8c53b5fce1b2e7220e2d0e473bbcf2698f9993b1284fdc26721
+DIST genpatches-6.6-75.base.tar.xz 4089936 BLAKE2B f88b0f84e3d73f87025389a3a66edbeeb6c126bf93b2522105859d27911aebb768cbbb2aa8418fe7e778eed6130b2253d85c08cedfa99c188c02d8d043f5fc7d SHA512 ebaf66ba8a338d548041c1ed619c4cde495a3bcbc990caba75dc86bf990a159b7f431e46e84cd16cea62991ca9d50420747a988da6e0c3973aec25943bc00d8d
+DIST genpatches-6.6-75.extras.tar.xz 4056 BLAKE2B 6e2e14f16a7ebc675e84b180a8f26f485aece3f22de1d27bef60b414deea8f3744cbd95536b58722d793aee320b505d5ca3c0af0b1e20f238b02c29a12abada9 SHA512 c8030df10b17675adf3c48931f04c59d1795598c955eef39c7b3dd4f36c1af1d79e8d7405004952cfe4922cf100aa95d2fe3d7c6f6e0d683276d5382bebce399
 DIST gentoo-kernel-5.10.230-1.amd64.gpkg.tar 63324160 BLAKE2B 62af76878c2adad51cbdfa4f7fe6b508ac77d58490c807b8d800e971a6c60d32a0f6d8478bfb6d3a167e118d8a928a4da5c338a00d4bab3fae59a391d4a74cc3 SHA512 5a8eed28b0e8d49d5a45a4aca5e11c5f39eda93ed854fd9237c3cd6b90a511bc0426383b0a65293d6a5910bcbd27e67a26626e7df6844ee41797de527e2d2144
 DIST gentoo-kernel-5.10.230-1.arm64.gpkg.tar 56780800 BLAKE2B 5e294f0fc44a4df76c251be2232b85ec94a613bf59a116b7753373532d7d45f845809df0d379108ac6c75a8ecf290da47abbb574453a5595a05fcfc3d143fa0b SHA512 ecaac1adf2e5727edf3d1a0dc4c3cbbebc9fb6f8d574749c8a2c2bca7b0a57b6d66d4f28b9ee7378052cab4e7f671affd7f24d777f978b55396470ee071fe842
 DIST gentoo-kernel-5.10.230-1.ppc64le.gpkg.tar 52797440 BLAKE2B da3ae36a895bf2b8135098be61b6b1712dda4ad0ce241306b65d877bf48494f71d84ac209895dc73054846e23623c77144fdfdc6cfdc43cec9516f0be78c125e SHA512 b352e0e7df9e1ac907b840348b3c341be45a0dabbd539ddd89bac158c11517164414c73f528c7c9a0a5b6c92404045e1e41ca906a393ff1e2ae8d17f0e6422d4
@@ -112,6 +114,10 @@ DIST gentoo-kernel-6.6.66-1.amd64.gpkg.tar 267694080 BLAKE2B a5c96c54d1a61ce8849
 DIST gentoo-kernel-6.6.66-1.arm64.gpkg.tar 242298880 BLAKE2B ecf053442a99d2e2a6f6d60248044b7e37482809f4a81790fbb3fead6c285d8337b0322fa29a9e01d13653f8c52a3b7581098548e255a78cad514b2a0d228d73 SHA512 75b15541a590ba3b1836e450571524ec35f65efefd14fcfb0c09a14683150827a4ebfbe1691be51791f9cf9b0deb82d3d98d202277cd22811d8bc549e3531c6b
 DIST gentoo-kernel-6.6.66-1.ppc64le.gpkg.tar 64399360 BLAKE2B 0af6792f5c51703c3fcd56f00ce67fd7be394b3b94dea853219b453a9cb4c9d547c42e14a4b7b0745c12bd54dff4fef9f9d14539d324b7d19c3154de5b030fde SHA512 9035c4bf597a47556257727059f14aa2a2534d16388bbb76ccbfdf8751f3bec5e1f4a9c36bc6cdca1b20cff1acf66452af1e6bbd0dd7dae2c2fff58337fa7383
 DIST gentoo-kernel-6.6.66-1.x86.gpkg.tar 68536320 BLAKE2B 8b62b15893f5ea35bd605b24178bca6598e9316e499b259ea3d773c7119db746ffb5ebfc95bc94861a0264cd78f0de6a86e0fbcdeb85dbd8f882577105f821b7 SHA512 7c3f0fe6a78ebb1626a434088746e48214e30e4b7580a7231612c7b233d2eb9f02ae20ab34aa4fe77756b23657c0d6da75286cd93ac0740e08ae3ab6a83287c5
+DIST gentoo-kernel-6.6.67-1.amd64.gpkg.tar 267724800 BLAKE2B c38c7d1a3f3cf59afc345f1259311433a2086764bf7919051894cca8d442b5d2cbc74016ac4474b11d8855f760e09099d86bc5d31ede56e9e2ddbcfe139bd9c2 SHA512 c86849c88b3ebd4be4ab111876916896b02140bf267a1c071a5db845aab917d1bfce310da2dfd8a7830146963751735a8fff71e6513d513b282ddd57cba2a37f
+DIST gentoo-kernel-6.6.67-1.arm64.gpkg.tar 242319360 BLAKE2B df01eddbaf3d31b91b87bad4372ebf8f46a5a27bd0646593c9a7961b95561479dec4950c25e5a4cbcea4ea1e2be895a7f95d383f87593d7a4fc65f3cdd0fef3a SHA512 6067d6649e7e5253142b5416ddf8daf3087552f33895d2bf273cae7fbbfae26689c7d02231df6926d35caf3e8dc941aac28031f044cd9bba93f7349ac7874575
+DIST gentoo-kernel-6.6.67-1.ppc64le.gpkg.tar 64399360 BLAKE2B 12f72a9b32eaede365570266c84a0342bff045d599952797c902dcd8f0cc22bd64e89b3f89f29945f2c8f10a88f802e7bfa5988cdd42160a5b61131923a792fa SHA512 44ec739e47cfdc56c452b12182953942940edfcda069af413d21b51ca93b2f45712e949af9e24b336743ee0b55db9d658856df8e59aa9bb348075a342848452a
+DIST gentoo-kernel-6.6.67-1.x86.gpkg.tar 68536320 BLAKE2B bb06e87f36f8bf561eb508dad24771191b24e125e8389f5950d34ed86cebda125e7efd627996118f1f720ca0bcfbde61ba63a282eca8cbf0e34a5e195d05ff3d SHA512 bddf4efb828f770ddbad7175a5e1ba6d73ee166625e1a1db02e76ec16c045083cd75bbe738799713ab18eb2c2074f1e39e8df25711be55554e0f29d994829d69
 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.67.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.67.ebuild
new file mode 100644
index 000000000000..cd18b39c84d7
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.67.ebuild
@@ -0,0 +1,181 @@
+# 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##*.} + 8 ))
+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 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
+}