commit: 97e58924e0a782f449e3acce1d1a7bbfea5a7e69
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 19:30:12 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 20:10:22 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=97e58924
sys-kernel/gentoo-kernel-bin: Bump to 6.11.8
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.11.8.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index ddb8b9011102..15ff55b02adf 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -18,6 +18,8 @@ DIST genpatches-6.1-126.base.tar.xz 6431744 BLAKE2B
2396a656d5dc3fc93dba49ffd5cd
DIST genpatches-6.1-126.extras.tar.xz 4060 BLAKE2B
47bd1399a522dcf4df4b0a7614f92af4bd248862aa3ce68d2996791d3aa055e917df44e6b4acedb4aa45cf4c18fa435da4fb3f28ce1d28fa15e78dadf45aad39
SHA512
871d52af95cd400fc095849c0273571ec0878c646ca966d8c75f7dda19a6c39f2c1f862ec51bda565aa9be6395eb7f9092864147bef09a1bd83ab037922537a0
DIST genpatches-6.1-127.base.tar.xz 6449936 BLAKE2B
ba2e6b0e5968e00205bff6eebe3d120fa674e372b80f835e48569eb85461437b62f4a9fe46a86b0d05a5eb0275298b7eeef608eb26d097f1d10726259b4737cc
SHA512
a1716e557bcd7749621caeb463845f9b9a059d20044c4721f988489e9730f94da4fc99c253ad518fd3513bd45f1a7382701cf05a7269e63230127027d83c8c20
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-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
@@ -84,6 +86,10 @@ DIST gentoo-kernel-6.11.7-1.amd64.gpkg.tar 291768320 BLAKE2B
0259b282af15d8f336f
DIST gentoo-kernel-6.11.7-1.arm64.gpkg.tar 268748800 BLAKE2B
2f6596db8a8b6fa68be3ceaa28129ca3c4962a2d9c2ec31d9d3298f24de260d7b7b3255fce300e5f36d4abab219e1b1715e12076f1b1595023735de84c0a0ea9
SHA512
77f6b1bead022da74d4bc924f9d3eee056b1a37f078b08472b19d7e1f4c6d88ac5b38b3d0c3f163807365b5a55ba19a5e5fb472c9d73d582c3fa4ac9b4781237
DIST gentoo-kernel-6.11.7-1.ppc64le.gpkg.tar 72796160 BLAKE2B
a6a694ba81f73fcbb88bb5ec3958342d09c409f2faee984d53647761a53cba1cef8021ce42bcb8eab6b3df926c4500e3c162cddaf6ba3f6f54ce769ed4a838ca
SHA512
506b93164736ec1bf4409a235534054ec36e0681431f6d0feeab215b9c2b4392e58b37eacc1c643af50a626b50c8b4a947274080259ff7ab7ee4951b0af1f174
DIST gentoo-kernel-6.11.7-1.x86.gpkg.tar 76472320 BLAKE2B
ad9ac2aadb96ac8fc7cd3de34c07b279798984f7abe1c57988d2aae4be012eea95c5d1603d7cdb0ffc2d1859ca891c6c10e583ab39ffc02167ea2bcb65e1f03e
SHA512
1fccf930c57d6153ce3f936beb6f211441dd269257e6ab886dc4b3f4a3013a32960298cc8e3ada36e9bfbb3c951b3e6330a0d34865d13325da1744c11b573e66
+DIST gentoo-kernel-6.11.8-1.amd64.gpkg.tar 293765120 BLAKE2B
4869cc63f12d2a4a7505b93bd90298040cdd9c105e5b1bd2699a641c2d69b51591daed7c464ca54c68ef7afdc4a847bd6afcf3505f197c8951b77ee67a1f1b98
SHA512
ba2dba1ddf7558aafb13d6d8ac494a66572ecce5d0130b9c0f7bc7513dece2acd010399580800c0761bf1d07576e75f39b9820ef36000717f05d163f3ae9e98c
+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.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.8.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.8.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.8.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
+}
