commit: e980a7953ce050db13ed659a63c459cd52d1c2d2
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 11 18:54:23 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 11 19:04:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e980a795
sys-kernel/gentoo-kernel-bin: Bump to 6.6.26-r1
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.26-r1.ebuild | 161 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 346664659498..94dbb395d96d 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -34,6 +34,8 @@ DIST genpatches-6.6-31.base.tar.xz 1700036 BLAKE2B
52497ce73dc1a0eaac0a73b7c9a8b
DIST genpatches-6.6-31.extras.tar.xz 3704 BLAKE2B
25bfb920528a71136639dcd536f1b8182ce687d5e8059c29539ed6ea348928cab361867afeb0eef55b040fa3860c44d7510ae9d453a805785567515a7157d009
SHA512
f7e7e6b2407752f2f868afef958e88dcdfd1788bb518f17eb60baaec43e55cc69b9185ae55c515b9bc617dc1aa7d1a958b8980ffafd95228aa3322ca104a8fa3
DIST genpatches-6.6-32.base.tar.xz 1799112 BLAKE2B
a9c9af39b7da19c0d3f3a1893de26641b1d5d7ad242de4ceb1659d33573e8df8d173d363f005843149ee21598a2d4f8a6e5fbbdd02926c23cccc01a5c0b8abcc
SHA512
2204a3ff6187c349a41f101bddffd39145aa530e6a37792b391db0b3c4150e290ce8909430e87c8deb18400d753a621b90c26d581c08abf104a8bc48197a1fe6
DIST genpatches-6.6-32.extras.tar.xz 3704 BLAKE2B
42d3c81bbd7bb8f062a5f437f8c1c9db1809cea8c0628f8604f7c2c8968fca4c6629bd3dafa2eae1e7b7692ff33a9836e1be96a0e3b45db95752b96b9f76f58b
SHA512
35fe52d2ad4b4621d7bb615e0c5888eae83a88d8554abae069d68e801598c2fad360c9cdefdbf3e7c3c083e50eb2317f775f2ce23c26ee7a07446184b7dbbdca
+DIST genpatches-6.6-33.base.tar.xz 1799480 BLAKE2B
c724ac510c4ffa2494a95268c2c97898f78c54a5ffb48f2fd6b74dc27dcf51d9403e60ff4e10d1f1c673a2d09ec6dd9a00683297631fcebe28d4f3497ff31e4b
SHA512
dc253ace1b4d1da549e5039682f4e6987ad48da88c63a94968d3fc817b2a64faffbf3e7024417036df3f645346f02f913e81857b7b261a6b174fa4f9d18b1db1
+DIST genpatches-6.6-33.extras.tar.xz 3704 BLAKE2B
c337062a967a4261f48d3a571d4267ac9e0a259013eb9f5f40ed306712d83ac87108c7e60e7479e6e3fec9490c85e6d34bfc0a5c67fd30fe56970b858ef9ccd0
SHA512
fc857243332ef3b7c5e1698c0a4fea7860ddfc2a4f240e6f538b33bf4332d324d180745270fd0787e9d26fca575a72ec5bd0c0983d63304775278a4d51a168c1
DIST genpatches-6.7-14.base.tar.xz 759200 BLAKE2B
ab81cb25145e344d43c649a7330804d9fccebd85aa8afed415c8de65d7cbdfea1884447f825b10919543d667127810dc2efae7001e52c506c9bf0598a3f572c6
SHA512
eaec167accc9c27c002262f39cd01d2de897c9629fc226360887b513227104248cdce2d4a2d3d25e86968e74d5f7dd516f599c5e45a77a896b3a482d194b1622
DIST genpatches-6.7-14.extras.tar.xz 3704 BLAKE2B
2dc79c939c1793afba3591758b5a4e51987683c086e688b79c4a6817cf35f1486f06a869e18bf49c5d102c77152b842bf4669e9c77b59e35401ffff2de422477
SHA512
e198bdf7f0d6dbd937f31d0ae4d0de3a9c1091410b5a709ab1606a21372b6d2b58cf1e298ae3b1f25fac1f677a0f618f01755a542493879d876bf296f8fa33e7
DIST genpatches-6.7-15.base.tar.xz 971400 BLAKE2B
fc87e6e218c0c26051b83545f82a491a83df9b0e324f1f659329b144a81aa21ac6e90532ab080eafc99b7f87b9d8ac6aca84b043653cd09b8c41b7e34e52a9b7
SHA512
3c62c11bd8de96e86dd7224bab00103fabf5dab58c2d5d6ab2c27302802eb3d5fcd9370ab8c209f4a62a8f2d290107edbba72bf9dd8d78760c15234989aec5d8
@@ -120,6 +122,10 @@ DIST gentoo-kernel-6.6.26-1.amd64.gpkg.tar 147240960
BLAKE2B a104a0279c3e7e07a84
DIST gentoo-kernel-6.6.26-1.arm64.gpkg.tar 119255040 BLAKE2B
47f5b3e6229e80c8823facba3aec00b7dc27633d64908231e2b4ea2a6ab86235d401c20b97d5db10ac72344dac63d57524bb835a2945a9e6456c10c540a97f2a
SHA512
48b7117b2fc028ddf146d5a59093740ab7629fa8670eda87b620024eede22836370e1154f71fb4ed3d6537fb133860253f234329f924e81ce1a2661bff24db18
DIST gentoo-kernel-6.6.26-1.ppc64le.gpkg.tar 64389120 BLAKE2B
65f185da15cd692031b944d9429d9f0d87f6805298ac36bdeaf1a8554167cbe6131d58cb3f14d804e3730d6da91cdccaaf57a56ddc9f3ec1801c13d58254b25d
SHA512
8ce68597b1e4390ad95088b9f0058c584d98e84f4d78701f8ab688638689df28f4de49b473d6adc69649b6a1d6c9c41edff88eafc2ee9219353b2962097acddd
DIST gentoo-kernel-6.6.26-1.x86.gpkg.tar 68352000 BLAKE2B
9dbaffca008d5d7d2bb4eebd90c44da4c940b59c2785b102b6b07dbbe963b3e82d3830cd082c2bd88ff669b2a82c4a451ddb0a0d17cff73051a87e79862e5bb5
SHA512
95f7c07a279e58f562da1e7534b0cd8e541eab28cf51fd246da5d6c88479dac67809ae8390bb0ce75f063de389f469897c5c5ffd9e1e4223212a2ea5434a18da
+DIST gentoo-kernel-6.6.26-r1-1.amd64.gpkg.tar 147261440 BLAKE2B
28a7ea857ab96cb0f941179a3c5d3b527a3849ebabe63468a536c929bcf24e6ff13d56f10372ec8512d9a985267abd82a720b68ab46194ba70df3175f4c59757
SHA512
1f0e9d9e24b60ccd5ff99ab42268953229b4b7ec9ab7f81cc36d0dac93e7c833f613b2e42eec7fb060f0964364d4fd7db187ae9c62e5884ad34bae1bd3600f24
+DIST gentoo-kernel-6.6.26-r1-1.arm64.gpkg.tar 119306240 BLAKE2B
96707d0e99269324c7deecb8e24a5a90b862f38f715a5d3299b55b0c98cc93fa70941901f4ed55f96bacea9303fadbf2853770775a9c59695ed107deb63803f0
SHA512
ac4746b8302920c4b23d886ddd50a8c7eaab3fb52fc7f221cad4bd1e6e873d1668cb1a694b7ae5ad4be4d7d33ce8c719998802c2b084aa3bfdacb7ce8b466840
+DIST gentoo-kernel-6.6.26-r1-1.ppc64le.gpkg.tar 64389120 BLAKE2B
42d28e36c3f2b31acde686ef909cd5eb046e883474fcbab5ef917c936f256019265268d622794f3d22cc700a247307e7a694d1ec3e49ab796f37bcbdd0190e38
SHA512
12b2f95e931a7c7d5693ff550f0040c39d613cf2e1df99a8a89cceb4c2ea7022945431533accccf6a02ff98b9ad37199a0d014d458ef334ff42d62df097fc48e
+DIST gentoo-kernel-6.6.26-r1-1.x86.gpkg.tar 68362240 BLAKE2B
9d896ec2bff2f767d194e6b3a303310908984bc186c9c185ff6f0eae0bcbf5c3c168b9a828809f3432277df93f17ce6ded36098b2ecf018528aeda768f42cafa
SHA512
927c00cb52527df7af02db3a21033655abcab8a01e8d5b221ba7d86d7f777b94132a4e7497deb53aaa6d836e3e317161a2ed0f4784ad184e45ffc1b2fae0d644
DIST gentoo-kernel-6.7.10-1.amd64.gpkg.tar 149401600 BLAKE2B
943b7f5a49ccf2b15dc97f7287aafb6fe9f0100e17de98610630049ba0ce0d1251153bb19cdb1227f21d502c5a7fe3652b88eaa4db6339707517d219ebc687a3
SHA512
a5e17b08097706ce0d43e3182c75529d8a7007e13c501b7409c9079f1e560010604108f8ed07f47374585a9c3b1c455c4e9ffa96eb0d1cbcbed6704b694a1d2b
DIST gentoo-kernel-6.7.10-1.arm64.gpkg.tar 121231360 BLAKE2B
6b1d5f9cb7850d8dc9e8df63d2bedf4593e56d6658e4992c57fa77352547f2db8a27ad489df30ead11275e4681c7b19a8655d55a2304f4b62e3957edd1795673
SHA512
65ca057f02a791cc9b5929640525decd5a378d8ab5f5f34c048adc59be32c59e425398ae7d69a2efb36a1cb15deb43f87db4f4a3086007bf8d19f56914607278
DIST gentoo-kernel-6.7.10-1.ppc64le.gpkg.tar 65536000 BLAKE2B
72b1f773ea421332d95a119a96146f0ac18268a852de43e6ffc8bd018c432689243a8f04fbe8588b670e566c574bb396bdc975ca25a45ab58e6eec63e8c2ea7a
SHA512
25312e14fd2a8c31a71f6697bce9443cd46bb45e7b3bacb601971b0f6ff53c4e1c40aaba259f8c6099ed44b944f3509607cc48637ef430f373ba06ea0d7a5b3b
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.26-r1.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.26-r1.ebuild
new file mode 100644
index 000000000000..ecc98612a7de
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.26-r1.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##*.} + 7 ))
+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
+}
