commit: 862b522a1ec606000c5dfc6fddcda6270dfe7e43
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 20:37:50 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 21:45:14 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=862b522a
sys-kernel/gentoo-kernel-bin: Bump to 6.11.7
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.11.7.ebuild | 182 +++++++++++++++++++++
2 files changed, 188 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 8a5f672f3e16..b303cbd38a35 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-6.11-7.base.tar.xz 562312 BLAKE2B
80227e573f63c6356c846fc1608cea
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
DIST genpatches-6.11-8.extras.tar.xz 4056 BLAKE2B
33f594ef302fe78ec07e146dc0603ecb3eb0b61c6f3639dfd4f89885cd5533c53b1d0ef30618bf8c1fb749499721f668e28161890835725b4e62240f2bfd2646
SHA512
6424792e0f38d94d19d4849552597c5f44df4a47d09c237b49f084c4d780501c2119beb9d45e9027526423175e7e7fe9939c59eb242da5462bd4b6331edb15fb
+DIST genpatches-6.11-9.base.tar.xz 709096 BLAKE2B
999c593ca8d926d2788cd14e7a1e868a798b0067c09266a2df3d2c12dd0c9ca571e620d1cb708cac29f7b0316f45b7a67a9432a84609919823cc21b4e54304b0
SHA512
e243321366c6fc45dbf1f710888c332bcaf64d520ca21ecc703d9ec03d13535767457f117f734017154f8948a2fb6d48ed1fbfc44b717ccfb41f69d2acce5339
+DIST genpatches-6.11-9.extras.tar.xz 4056 BLAKE2B
b2388d28af9c0b2afc1c663bc1b98c0f3bdda9fc92879031d057510a9c1f7edc036053d68e66ec83cd12344148bf9968482f6075d602b71553c969941deec4ae
SHA512
7dc9b2702169ed6e91ee5bd830e2d0bfd84e10a301d3aabb1c573f636ff9a2d96a5c837381573a0e5c69911060682e9f7e0f794a2013cc11ea7b845592717aa3
DIST genpatches-6.6-65.base.tar.xz 3582916 BLAKE2B
3d750c677e61c122144de989a55db6f04a2a545981858b71c602c156f802478ad19f4d87629760be724a9b522b377479df9f0c5f9a859235c5fc438df95c2aae
SHA512
1ac5e7fb36e50227a6bdf035562f11401ef6a19c1a7af2d001d224b8710e3aa10434d828a3a0213a1f5cce101992bb803199e5d4e76474b657dc5c4d6328c385
DIST genpatches-6.6-65.extras.tar.xz 4060 BLAKE2B
53cdbf5d680c9943d189e7606caa10c18bd3317789ffc1f120bf535255d80bfb5e3969fe952eb0da3c1001ee41e93755616332363465d4714a67a90140c43bfb
SHA512
b5b3c817426be391a72633740beb4ba7b4e2546ee441081906d77ba31636321501af414140d487d284de325f80d004aefb241f3e349ef3ccd62d2c6fc4d7cf7e
DIST genpatches-6.6-67.base.tar.xz 3647888 BLAKE2B
bbbefd68b7d6ade81dd81f600717a529f023d7e74ddc4762698554ab6c3bca29787082aeb1945136abd32e628c6bd9b3e4a164388beb524f51af4497217af34e
SHA512
8d2a1481d1b23044792e523b4a6845fbcf29888e6f98a6a3b0b5b3fe909a9ea40272087071dfe98da3e1a954c6d8c0539d087c1616929aa76d504ad88baf9878
@@ -44,6 +46,10 @@ DIST gentoo-kernel-6.11.6-1.amd64.gpkg.tar 291389440 BLAKE2B
4c5e3cd6bb1d4c798ee
DIST gentoo-kernel-6.11.6-1.arm64.gpkg.tar 268462080 BLAKE2B
e9ccc0ab604dccbd7a86a07ded8e3c4ef495fdefbdc0146fdd917bff3514a2e83edd293654e347b8b878dc4014c5584fd845a5fb4f3d376a20fe32e18cac9126
SHA512
d02ec12629981d102aaeef96d8fb4dcb8039b680dc580b0174f0802e362361b20c2f02c19e5c9d7b4f8ff5cbee578d6a326398411872e3488ea980d424dd6c5a
DIST gentoo-kernel-6.11.6-1.ppc64le.gpkg.tar 72816640 BLAKE2B
019c29aff28ac2b99886eb68f6b2809d34803dfa1bc82c68e914ede618f2195c9609ab7408bd1748526020f5bcbe5eb504ec232805ea182909fc7dd8d7869132
SHA512
edc9ad35a01b1c2201dd76f550f9773fe10c4e86d1b1bdb610140871ff917f1b813a026f3f46cb62ad467c43f9a87559a1406b17ccb04d5bfafdc80492ddd3b3
DIST gentoo-kernel-6.11.6-1.x86.gpkg.tar 76472320 BLAKE2B
51b28592911cb54ff06079877e3ba3a198a3ef0e287a011ea89bc406a977a568c1a59927b464cadb1d6955134c72f5ccd1fa0006eb235e3f8e59916607389c43
SHA512
83107ebc4d9149a2e9281c854e42c7930941d0d2d3de227a984616cf73b8c0e495ef009bff3663f0167ac72df79ca3eca59e52b980e18702cbc127c650818621
+DIST gentoo-kernel-6.11.7-1.amd64.gpkg.tar 291768320 BLAKE2B
0259b282af15d8f336fecf4d88a29bc1b29a0aac862d0c570e16b592d8f3f18d51b3b3b4116190fed25a9fe118a34bed9d1a8e7189d834a926486b40bbd1a905
SHA512
c9f392a9295d173a0628f80b4e4d44b2bfe8c430bdf05c4de22d1efffa38e0ac9bf54ad1b0866ccd09ce387de7d598b519ae76b467d1d4bd99268479880b5752
+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.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.7.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.7.ebuild
new file mode 100644
index 000000000000..b35a3727e6c5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.11.7.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
+}
