commit: d9192131f81361a70a8902dae4cad8cbf0977b9b
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 6 13:28:04 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Feb 6 13:29:00 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9192131
sys-kernel/gentoo-kernel-bin: Bump to 6.7.4
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.7.4.ebuild | 161 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index b93f853c1701..55f369e4e9c2 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -28,6 +28,8 @@ DIST genpatches-6.7-5.base.tar.xz 195356 BLAKE2B
64dc86eb0d86a4afb318c09593bf0be
DIST genpatches-6.7-5.extras.tar.xz 3700 BLAKE2B
8d4dcde0675f4921e2c0e34dd7df63da281fdef2e670b050cee44ef8cd3b0040031491a8585e72d166dd00af3e278baa1c4df7f3386a1a946ae141b67d31b25b
SHA512
6654e57796aaa17275621dd91ac1b205e4fb645231aba99366a3fe4136e713cb5ba87fee7ab3b0f606b3a6a0c72f402764760a110ca7299b2faaca492ea5585b
DIST genpatches-6.7-6.base.tar.xz 325824 BLAKE2B
f95dbe909af13e4da2edbd37d320f077b4229fb16d5e63c7e81f8bb5ac0e7fc78740dc94071a86e9ceacc12833b78ac0809c112609843551960db0dafe14ecef
SHA512
307a2dc54dd4a176effc8f942a60d7a5516b8402a1255fb4e9d2ac34f2316f813741ce3c3fafe3900244504323aada4fe22a3980205c062e3235dd623305be66
DIST genpatches-6.7-6.extras.tar.xz 3704 BLAKE2B
1e9669edb016fcf24960bd678171eb5ad3f8ef6c3477d1f3a2ae4a1f3e0cfe1a9ed14e54d2316858c64c1f52702659e6c3ba2bfd5ce079f2bb04f1cfec01f329
SHA512
fb786fa90d0d979d867a7c5fa9c24f81d3c019403d8dc8bbaf5c72c105703ee5fdb5305974062d274cbd86b712f62b053b82fa34f4b8096247da944b5ae2cf58
+DIST genpatches-6.7-8.base.tar.xz 460076 BLAKE2B
367e038c6a8a02d8157b947f28c6b88b3053c2a491a0933f000f0e30af41bddc50b760b5918ccf1152de4d2e4a551983435f68c421d0cce6dc352c900bdf5d48
SHA512
d946201fb054810bc54bf73e4904df6deaa1b539623c5c77002fa95b49ce5d9e38fb3ac94e74a7b9d5ca57d7b21ea0dcf7785437fb216599202fff0d8d012b92
+DIST genpatches-6.7-8.extras.tar.xz 3704 BLAKE2B
98589d74cef3e628d7a693a46f1f87845ca98faf8093c9e120320e107d8c1e76d82441ec6b1a3f12c9c5fc5d20cea2cab4d6cd5dda99b318bf31ec5ab7c8447e
SHA512
3e9a993586516e45d2fca24690b7ce001922732c20c5f52a7d954e5bdd1f8d7e91d4074b5128c085caeee49539dcb1a5a505424225c0100b8741f54d6ac3d095
DIST gentoo-kernel-5.10.208-1.amd64.gpkg.tar 63252480 BLAKE2B
659253d258d12ae26473b9a3ad2b8e2ca9f481447870f290dca411f473db81ccde43c35b86590c0df563870c8d75496a4b2bd0918224f0f36a04a960be4b28a5
SHA512
d251deb2cfe021e477489f471bbe9c41c098416eb4b3c148c51e790be075b661a9db4264c3d6125352a7ac325bb0b982f8b650859c34fc48f61464851a7ab750
DIST gentoo-kernel-5.10.208-1.arm64.gpkg.tar 56729600 BLAKE2B
3a57808162fac71ccf1f9539d268680f384476b1c497b573be141da8a48c68299562bf206813a0e35ad097b426fa70a14956b3ac474117e7eab227cf3f780230
SHA512
18beb0123749b717a21438f26aefb49298e392e57b517a7be6012d484d6dd80968d87d78d0c48cefd2edf45885d691ecfc2cfbc86481188c296d4afc6187b975
DIST gentoo-kernel-5.10.208-1.ppc64le.gpkg.tar 52879360 BLAKE2B
34db7f65b4213a245e96716aa74af9fc2bafb67647f76681abde762c72a3b4c1d4b8dc8c98e3a5fed51ddc6c49baf6473a8717fcd596d4e2ebcc9aee4df8ded1
SHA512
c0704b57a4de8bcbfa04f683ff5155ba022774ec22d8ef7dc65bd14db574e95648ea67a5340f7c979d57c14bcc779fe1a53007da249c8d6b251230fa9f04af98
@@ -88,6 +90,10 @@ DIST gentoo-kernel-6.7.3-1.amd64.gpkg.tar 148244480 BLAKE2B
358f16d7bf2460408926
DIST gentoo-kernel-6.7.3-1.arm64.gpkg.tar 120780800 BLAKE2B
bf3383944f88535d553c1b9dd143da0c209b96acc7eb95219eba9c7ff08ba4e1602609b958e14fa88f64e4b6e4f23ac3204fab2ff5f3e2cd2a0310a672a6c902
SHA512
834ec10ea9d94083cbba56264f393a190caf3863d7107b5a5bfd67ea3c73ccb09a2b2ea7574a4ea33c65e2d8e8a75cbe67688e8ceccbfce19b624ce9d73a641a
DIST gentoo-kernel-6.7.3-1.ppc64le.gpkg.tar 65495040 BLAKE2B
f429cdc3a16f62f700aea29c36a0b6f938effdc918ffc98210a9436e26d1f37ab492b4095ca601b8a40fa14a85a237c034a33710481a143b61d4b5ca645388a7
SHA512
9de8fc66a2d5485b6374c99cf3468756211cb30962c7f1d27552d620321ba05b6ffa776455a755f8b49511cd9b6f5dc6df62e90607397eec4100be39e3c0daff
DIST gentoo-kernel-6.7.3-1.x86.gpkg.tar 69478400 BLAKE2B
9f53e78c084af44389c0b752b90f5872530e62192c2198e76df534278da911322320d97ffc6412e3bdb9a047d5f70913c652abca990d33f89e992752d8979351
SHA512
4a1d8e7d30d87c5b1e0982e769792ea4dbc8e9a945ed57a674def5b78d2ee22c8f3712149887b489089d2c6bf8d930f32b560c3da7e787a7299bd4bd4353932e
+DIST gentoo-kernel-6.7.4-1.amd64.gpkg.tar 148264960 BLAKE2B
23284df6ffa88e4de54ffc7680bcc3318e6d64de7ffe44a5386bb3cad8ac2c4b28b6a7f117afba0ba8f9531d4f524e68586c4ccaa6a6c3960ae000d588c40440
SHA512
6ebc6631c80e2fb392a416944b522460880ec0203b04905ec4154e78aee9619e00d4da3ec704342c5a14788a4b8becca38f60873fbc68a6bb0c869530ce8b1fb
+DIST gentoo-kernel-6.7.4-1.arm64.gpkg.tar 120811520 BLAKE2B
57107c3273a0a1802b1430632d390d34f4e3f4271a796a04d0b3ce542f3965473f542f14921d0c73f9e7c80eac73bb2a0aa871856ebda44f5b9f50e2f1b79904
SHA512
3f31c79d7c194cd1049bd5a0600bf5613c03ab0ded6c6147c1708d424db439f6faa824f3790c6a20c51e7848281b448910b465cc4246a36e127ebc5e973655ff
+DIST gentoo-kernel-6.7.4-1.ppc64le.gpkg.tar 65474560 BLAKE2B
33d8aa49a35bf3e5df50225633a49724e3f2a8f700004f659e93773f5cebe851ad1e7a84f5170932e85c66da1d33758cee83541eea2c2883c505879a9d5850ad
SHA512
8abd3d831aa4ad5791e92d91b4148c7b23f9af973bce0b5e852dc905fedf3a650676a2a7402701fac63815d1e65606b8a8f442851bd3e0154fb417322870dc3e
+DIST gentoo-kernel-6.7.4-1.x86.gpkg.tar 69488640 BLAKE2B
c1114d6a2817c11188822d9f9df92d7ab958d352f2133dc1602dbdfd636180e7e63cc0f08f88278dd82b3d642012a30cf03dd26db49d86db2960d835f083aff7
SHA512
7d7d9f593c7674c89f976b4cb384033e26ac1d32d0692723c737f97f3d81cb5fe757967b1ab6a5b9aeded4e40a3a2b68de1cd0451c69c3f345894757b633810f
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.7.4.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.4.ebuild
new file mode 100644
index 000000000000..b73e3912b990
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.7.4.ebuild
@@ -0,0 +1,161 @@
+# 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##*.} + 4 ))
+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 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)"
+ 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)"
+
+ # 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
+
+ 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
+}
