commit: fd311601305283f3663f5dd41e396917d077408c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 17:07:49 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 17:35:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd311601
sys-kernel/gentoo-kernel-bin: Bump to 6.6.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.9.ebuild | 158 +++++++++++++++++++++
sys-kernel/gentoo-kernel-bin/metadata.xml | 8 +-
3 files changed, 171 insertions(+), 1 deletion(-)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index f457a2067ff3..1cfc3ea20a9e 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -24,6 +24,8 @@ DIST genpatches-6.1-78.base.tar.xz 4233428 BLAKE2B
489c688bdce6b557065c5a2c63b35
DIST genpatches-6.1-78.extras.tar.xz 3812 BLAKE2B
b06900c35aba0f1866d2c64a71785afe6a8b6ff0abe12a15f02475470e6f327c7ea35df1af5bcad92ad0cb9aeac030f0c4328beb69b1b74cf9420ac7a38555cc
SHA512
d3b76b5301b4d6901ef8ae3589f9a3c948a2c88cdd932e748991987f45e4ef8b19b9b7102db83210ec17b67b00ceb597c22722c7ba3f66ae7be76624a1564522
DIST genpatches-6.6-10.base.tar.xz 603340 BLAKE2B
cc3220f1df9406c393605942e1a6fdaaf8ab46da53bc2fe6d001c9608a55ae2e5073d94805eb233183142e81bcea9bab1ed4700e298fc32c16c033597219f9ad
SHA512
1f0149759b98fa099bda28aa1c4913719f0b5c0c715a72f6c0b13d3faf317a8935ce10508cd3459c50e39a7759feb44e7cf43fd49b87bd5ccd6d42a5dfc531d1
DIST genpatches-6.6-10.extras.tar.xz 3704 BLAKE2B
8b5e1453dd7bbbb7ee6dd02aef5e25e95f09a12a46d9dc014d71fe8fda96b94770f3cee75fa6f1db6bc9bdb67b39d272f8f887fc2986a17769237768bf6a382f
SHA512
6ca7a360dc217684b1a06f869223a52772f267d48088d5e286dd27056faf34e9c4b4d575aa771c5f9b972febd4c656e32f470c4499feecd47716b07cc13ab933
+DIST genpatches-6.6-11.base.tar.xz 649760 BLAKE2B
d435eda1a18196b24c451ae605c719cf5a45c255b2017f1b7ab3612df3f4101c003e615589841d02329e44c3411b4cb27b577e8ff05f09e9349d38e622b823d1
SHA512
b06c66f730e4a43d8730c5c98661b6061485696375d2bc623b818303b0f6f15d9ad9da318bf9d3153036c3d8a2215fe12c5fd8b789775027c5c21f2ef8d93c4a
+DIST genpatches-6.6-11.extras.tar.xz 3704 BLAKE2B
a5ec7394f611c491ae0867c4694fdd000a0a53d6353832ecfb702f6b86711d7c955f0e4a8d10ee2cde6f2255a6e180fa26e3b1088f04902affa51d29f590fe82
SHA512
2ea475f922c98a83950441e86bd6805fc958f44c77866431b28da13d522d11841fc778945b253e292c8cd09ee378bd7e0169540ef12a9206d6341ec69ff463c6
DIST genpatches-6.6-7.base.tar.xz 472596 BLAKE2B
c5f69fa43401555567c9e5c3b5bad31ef55a3f49756f86e1e5cb935cf8cffb6ee080f411b5113dc3fb9d43224de432e6f1f6fb5a18082d269e30181e72aa1fcd
SHA512
6098a5d32ff83fe2ceb094055be6336a19c40246946606fd0b39e86ce8bf53b96cd5539e6cbc774dc865f4be742ac3c127f8f48ff5cd3a50484dcd5afb7b9df3
DIST genpatches-6.6-7.extras.tar.xz 3704 BLAKE2B
1bd0d01aefad3c47f2b7bdc550e607d2c4ba8e0cbbdbe3ba4ef57e539f9bd894222ca6f01908e6bb27221de1331634a6941867c7d6bece9620510110bf276107
SHA512
6da82d251ac6c33b8d2837e1a44a32ab5106f0a5816a8e76354c7d9eef510b4f485edfb1b80dad68e59b3a96494bed590ba1508f7b96697c364fd52c97b65496
DIST genpatches-6.6-8.base.tar.xz 472816 BLAKE2B
503418967edebb8cb2020edab16f060334fc16c9f6ce7980b8e25e3db1fc4869571fd466abc8ec4add3a095d089f0c77532b2524fae1136c5f7ed487e90ccd3c
SHA512
04a247aadefd43a9ec1382b5f77f18dabb1701469cbeabcaa1604405cea9112bec56bc9a08d33f9ce5ebb90b8d77a7c7a21774a10906f3c8a685c0d3c10bbe9d
@@ -94,6 +96,10 @@ DIST gentoo-kernel-6.6.8-1.amd64.gpkg.tar 84592640 BLAKE2B
bc10348b50a26e45cd3e2
DIST gentoo-kernel-6.6.8-1.arm64.gpkg.tar 74332160 BLAKE2B
ecbed4c3045e117bb4040195dc2dbdf252bc2553eb71b87248e5bd2037a91f397796a0d857e97135defd805dd0eb701c9fe9f32722ca47b1bbc8c9fff6987e6a
SHA512
737286d0583d836d0c6726470dcceb9e2496660de1103cd591c406ee827e23457713c960bba28118d2fd756a08235a65900bc165d5320fb9063a71b5e6a19eb3
DIST gentoo-kernel-6.6.8-1.ppc64le.gpkg.tar 64348160 BLAKE2B
69a1a842f65f87db305e05f8430b40fc1639867eef5c013848b0683d4018da2247cc89655fddebf840ff390ce5c1b23c768acf8b9b6fe4230be78bb0b60e7f1f
SHA512
2811b86ea85e193750e75c94d20bb59978964626dd05abcc482bf61ee4a81aa89bbd8e48f83b80752f7ff7e5bf79721eb4464bbc5814ad6092745802375ae842
DIST gentoo-kernel-6.6.8-1.x86.gpkg.tar 68259840 BLAKE2B
f36b39afcc2032f84664a2917fd4bd344f515e647de544b58c482dcb34cb78f21afdc5fa971c8b8e4af5bf4895a91f90e69fcfec7fd47a3d9c692f865546c357
SHA512
e98aca6dce21e70de98937c742777343a2208c58730f222afa6b87429d6cce566f513abfb3266a7f46b088061fca57942b8686e8ea3199cbf3d43ccb8e75b763
+DIST gentoo-kernel-6.6.9-1.amd64.gpkg.tar 145643520 BLAKE2B
ceae9156ae6c37c45b0105e86a8bc29b562ed11c58a2f8c1d38e38b6b0c5c9e4f29908e633628a18bcd4180ce5def1ddda5e75dc5e25422ca4b108675e30ea9a
SHA512
3ccec88ed280714b2e26e0c7cc2a07ef3436bb07502bdd704c005a4e54f9469355ff1d543956b049b52f8b3277f664bbdc353f5983c16cb046f49b86b7d26d12
+DIST gentoo-kernel-6.6.9-1.arm64.gpkg.tar 118558720 BLAKE2B
170d7f90400b9bdc0d4e98f7871d4f7622c670bac8baefd77ce531a11acfbb34e5ce4c4fe727918009b2980985c6c8d5d15d1859f2e129762c68efba3d3a621b
SHA512
e7e56d77eb5391579fa1e8b5a6ced2c383e53c56b4079578f14a0ad5364405fc2e0088c6ab0851e5f8eb461912bec0b3d377560cf551b35cab3039ba750f76ff
+DIST gentoo-kernel-6.6.9-1.ppc64le.gpkg.tar 64337920 BLAKE2B
93a44b217ad4a3d7c1ce253554238e5d04da795f3eaf1c94fd44294eefe1c56130bda61985ce759dbc98f851c7da910934a777046f22984b6521867db6d69a05
SHA512
1d55ac1965e86783a290437bb654d727899a19d3953d428097fc9b169bb732227d8042ceadde85449278aaa323dff8827bf751c520cbbc8f36c7c742298d486b
+DIST gentoo-kernel-6.6.9-1.x86.gpkg.tar 68259840 BLAKE2B
86c05ed50692df9fae4daefc0448970f34b52c940db70803c6e8b259f12d9bdc1e8539f6d8b7c92886c19e9d84e6a20072c6d4f7b284cc9a0e0bbd67b30cfe9d
SHA512
157a67acbbd6f5731b31fba5861316aab90ba9d9254bb4623582c15d45508eaed7903af56b64fe7c3fbebbd28c4b6b3d6f3670b952b84e2fa2ac1260f1fef509
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.9.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.9.ebuild
new file mode 100644
index 000000000000..53128e72162f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.9.ebuild
@@ -0,0 +1,158 @@
+# 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##*.} + 2 ))
+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="
+ sys-devel/bc
+ sys-devel/flex
+ 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}"
+ if has "${ARCH}" amd64 arm64; then
+ local image_path="${kernel_dir}/$(dist-kernel_get_image_path)"
+ # We need the plain image for the test phase
+ kernel-install_extract_from_uki linux \
+ "${image_path%/*}"/uki.efi "${image_path}"
+ 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}" \
+ "${kernel_dir}/$(dist-kernel_get_image_path)" \
+ "${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+ if has "${ARCH}" amd64 arm64; then
+ local kernel_dir="${BINPKG}/image/usr/src/linux-${KPV}"
+ # Keep the kernel image type we don't want out of install tree
+ # Replace back with placeholder
+ local to_remove="${kernel_dir}/$(dist-kernel_get_image_path)"
+ if ! use generic-uki; then
+ to_remove=${to_remove%/*}/uki.efi
+ fi
+ > "${to_remove}" || die
+ 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
+}
diff --git a/sys-kernel/gentoo-kernel-bin/metadata.xml
b/sys-kernel/gentoo-kernel-bin/metadata.xml
index dcee5ac96edf..783070054089 100644
--- a/sys-kernel/gentoo-kernel-bin/metadata.xml
+++ b/sys-kernel/gentoo-kernel-bin/metadata.xml
@@ -6,6 +6,12 @@
<name>Distribution Kernel Project</name>
</maintainer>
<use>
- <flag name="initramfs">Build initramfs along with the
kernel.</flag>
+ <flag name="generic-uki">
+ Install a prebuilt generic initramfs and Unified Kernel
Image
+ (EXPERIMENTAL).
+ </flag>
+ <flag name="initramfs">
+ Build initramfs along with the kernel.
+ </flag>
</use>
</pkgmetadata>
