commit: 73689f6432bf380c58739d21041b83106dda5d6f
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 17 20:47:57 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Nov 17 21:02:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73689f64
sys-kernel/gentoo-kernel-bin: Bump to 6.11.9
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.11.9.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 15ff55b02adf..d1172b7f3f34 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -20,6 +20,8 @@ DIST genpatches-6.1-127.base.tar.xz 6449936 BLAKE2B
ba2e6b0e5968e00205bff6eebe3d
DIST genpatches-6.1-127.extras.tar.xz 4060 BLAKE2B
00bbd6f35eb62ca43804b3900d1281aa1d578a9666da4b57d47851fa3842e86c276dcba4ecdeafed75c64ddb840f8ed84539261650329c272881f4d074b77a83
SHA512
5bfe75a37ceeab697314ff24d509061f4154bbab6a3c755875d4bae7dae5d99a012ac5d07cbe1979517a6da3fe6857f0162565df337c055ecad6d3e5ce4529ee
DIST genpatches-6.11-10.base.tar.xz 757872 BLAKE2B
72566af9a781288f516dcd30881851fe371a0f3d072aeabbd9d3e57ea96896cb9d8f0d594f8729215baa83d9546c675789b596dac5781b3640e963059d23223b
SHA512
ae04d309e3b97cfd7f09993cf297fa5825c53e83acc54805f1f6f2d09cd07aa1715866be3d59874d0131d1746a398b9449fda1987ea6bdbd66402e411569d874
DIST genpatches-6.11-10.extras.tar.xz 4060 BLAKE2B
a94b8799f6c1d338a17e25b1dde6aa616754bfde092eb5ad1da11a6ec8b1107dce827d05ecc756a4918339329190e6572bb089de89d9a11c8c08f067eb7b269d
SHA512
1a166a0054827ac9bef700d075cc2a1e3934dbe7b7aa64b34109b521f5bb21e231d59be4643f6faf702e5d0b3cb7d82e8cc1ba1f77e3bf88c38f9b6ffc61e35f
+DIST genpatches-6.11-11.base.tar.xz 775800 BLAKE2B
96407b5f017dc4f59e07dc51d26222ecfa70c4575fd511d273bf603f69aeb826d811d73e51b9425fc3986a369a1a1ea2dcad49d0064d27c586262f5ec2c1b2f0
SHA512
0148bf938c34d063ba68c3de1535c2e7ae7d1c66e75ce3d9106ade4696ef391511dc3342b5919f3eb84976ba334123ef1ab1ae3c63a2a63186e02f08c9cb096c
+DIST genpatches-6.11-11.extras.tar.xz 4060 BLAKE2B
fda21856e2eb78f116cb26c24bce03c7fe60d0756610351351047f9fffa97ab327851adb1a5aa9ad7c9c63838a64a5498c5343b7499e452f0e3dac6cd17c7e45
SHA512
63d82a5a17472ac3e5f4c0bdb1cb706c0a1dd4e0d0bc2af2868a55e8fcc0138bdaef675b195988c00665a4d61f3c0940f669caa8809fbec17e0127962975c0e6
DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B
80227e573f63c6356c846fc1608ceaf336f209887a00e95504125298b24c3497a44fe53f7fb231b1cc2f0cdcc82a49e2bbb8496e16f182ef4884c7da15c62bae
SHA512
02441292bcfa15034f7bbdfc7c92b4c0e583208cc9c94f20c7f0edf4c18cb56630de0e888d5ec208c15ea75f03f8194bcf8b1d2ebad2b5e38f11632289928ad3
DIST genpatches-6.11-7.extras.tar.xz 4060 BLAKE2B
073ddb98be6a0ea659f5b494574f0c004ad9342a6ae9bf6b2c46ca83f44f10f8cb02a6df3b7f054d9828dac5d5488d3920d21157848cd85340a0fe7c9dfb34dd
SHA512
0b0b41516a7e47fb93ec819e90cbadd000b9615445dce61fda136028788791803f5681caef5e8e86c536063979dddae36d7c8e473a40fa1f65117f7125b1e5c8
DIST genpatches-6.11-8.base.tar.xz 639004 BLAKE2B
218ff37e8fb82b4bff3baa5b197b4c42ec19a4c5480620982f7befe8313f0f226324a629d6c15eee230faa3fc7c5bb558a58ac94e2e9b0259823c813220681b1
SHA512
cccc58e7ed24b90db88b14f9a693ccd021b1fa1beb9568511e344807673d2e518a66b2ffb48773a5d68da03ad15671181b7dc53bf2161ad1a88e95b555389116
@@ -90,6 +92,10 @@ DIST gentoo-kernel-6.11.8-1.amd64.gpkg.tar 293765120 BLAKE2B
4869cc63f12d2a4a750
DIST gentoo-kernel-6.11.8-1.arm64.gpkg.tar 268851200 BLAKE2B
1a62d924f84d4aa74d7804e4be30e14d7c43f5e9c45b7f170bed4a12e9cd5b3ae04054f7cca424f8b2ebebbc49dacebce5ab6a4f8c8bd3bc9c9d86249d775153
SHA512
2c903362decb4604f6e9a31b9824bc4b0c144ef49beeb431bc7aa44f0b2d895ba8b019cbd7117853f7e5a19b9b9a517e5e25869371572d7e3deb9a56a7e9e40a
DIST gentoo-kernel-6.11.8-1.ppc64le.gpkg.tar 72765440 BLAKE2B
badce1ff8ccd4432f69a73b4144861e8d077b62a1bd8b6430e77ffdf143fb42b0a809f897e3b2757f7784680aa5d62ec57025f4be2d77fd5961ea61403ad2480
SHA512
cc2f233d49f3cd34ca92d06b303eaa271bcf12a7f44279fecdf7ca59b491534d9f61104cf9dccefb12536b9cddc32e9f6c19daea0c945b2b39b3b9aaf259ee87
DIST gentoo-kernel-6.11.8-1.x86.gpkg.tar 76492800 BLAKE2B
811043b950491d1e4858e74c244cceb42d142154f9bb2ca6d24db09893afe87ee4b307181d1eb0c7b1ccdf99e30c1f761c4ef50fe4e32dac9ab322e4ce9fd9ee
SHA512
bdffac9fc50fa2a0253c1cbb6ed9e34420a003bef1e3bf77c75c30d336a9280099624c048509ea30c9034657259d52741961c0e415d383c4018e2e47f1856591
+DIST gentoo-kernel-6.11.9-1.amd64.gpkg.tar 293734400 BLAKE2B
809cd449448f374580853053a7041cd44b63fe65efba1225f22a6722de1a9650e2055042e06f775945fd63203c7c5679ddcce19258086e2684b34fd09943a076
SHA512
acb025454635aad8c0b5f31910cc9c1413f22f6b3d6eb8e29b60b385544ec2dc5960c25eb85f9698e1f4598beaddb81dfb2bfe76c262a9518120a16f823bae68
+DIST gentoo-kernel-6.11.9-1.arm64.gpkg.tar 268881920 BLAKE2B
a7f7f941a4dad9709e8a9597d435ffdaa0810c8b044fa7f8ce5d3b38d867f4695bf07cfa4e4a98766265c9fc856e2ce49312aa9864b29a486f00bfd387c17188
SHA512
78da5b9efb8e29688ddd1deb8c4a2510568e5786906cf300f5e5bd6dbdda3af69762536e702ab63dab99812f388af72e164f43b4fbe59a6e8955c1804c3c157c
+DIST gentoo-kernel-6.11.9-1.ppc64le.gpkg.tar 72765440 BLAKE2B
836d450f33a4acc5222b42e41a13b3913408dc2b8436a75ce1bf17d6462d8188a251bea9a19856ae4fd583bbb3efa692fe935619e86bd3b1730816c92031bc6a
SHA512
2890de63925898ece4fc98fa9483b21dcb98fbcf1e31d1a753c3e871787933243b91e019cc8b26c2f27a95234a8a0bd19a3113ba5d1c843cd500428421089b42
+DIST gentoo-kernel-6.11.9-1.x86.gpkg.tar 76503040 BLAKE2B
caae417f2685326841836a94af1c26872a9f9f1e653f0bf78d5739f1dc6492114a9c116a214658dc68563f649f006a42012284d416c7b93ce583c419f5969119
SHA512
46c31bdbdb8edba31f4514ff05d19f128579ddeeae1d4a504fea03c0e28c268a8c1969f0961954b08a92e1ea0ed5a0c9f5b6a8d930ebde88f982f6f25d63a204
DIST gentoo-kernel-6.6.58-r1-1.amd64.gpkg.tar 264273920 BLAKE2B
537efe26fe31375d739bc5959e6b22b639e227d2a97d93693a3dbea2f40fec2ad64506462fd441fe07c1900bc304ac31ef9317782bbbf9b54fd17a8b81ccb678
SHA512
afc37b354b2d4d16f12545cf30d0d6f5dc2170f231166b0c608cd11f98148bfdda420cc7deff15f1b91c8368589967456ccda90b3c9b681c22b883507765a6f9
DIST gentoo-kernel-6.6.58-r1-1.arm64.gpkg.tar 241244160 BLAKE2B
79de676d425cbe7eeee5a77f7953f283eaeeef665ecb0039e120c382225e8c1158f6695e86c868c7972b2150b988f16495e80b4fc402926900f8223f1a8d1cbf
SHA512
e2cf875b6adc0a8325bfa0c328db82cbc483373917501c069646a5d052eb815390e8150d80bfebe83139a5726fa09264b41684cfdc03a1379d6b0cfb31d84e19
DIST gentoo-kernel-6.6.58-r1-1.ppc64le.gpkg.tar 64296960 BLAKE2B
d3e787f293b0b9f3944b3aec0fb1198c81b23faa5234d60962f93035d244f6a73db24a6fc893ae3de85dc4ce52ce4a9466bd8f2175d6f78876d4d4c65ce84d11
SHA512
f21f4b9ef6a11bb8ebdc7fed49439bdc41769fe8d6aad5dd6b33aacdec8cd185acc7264674fa4887f30e00785677d5738cd04f3699f6ad2063446cabee48be89
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.9.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.9.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.9.ebuild
@@ -0,0 +1,182 @@
+# 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/-2/-1}.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 rel_kernel_dir=/usr/src/linux-${KPV}
+ local kernel_dir="${BINPKG}/image${rel_kernel_dir}"
+ 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}${rel_kernel_dir}"/ || 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
+}
