commit: dfbaf70e673c1d1c46c5626173eacc919fa15036
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 18 15:01:02 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 18 16:15:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dfbaf70e
sys-kernel/gentoo-kernel-bin: Bump to 6.9.10
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.9.10.ebuild | 164 +++++++++++++++++++++
2 files changed, 170 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index fde33e8f95b0..f4833ceb2953 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -26,6 +26,8 @@ DIST genpatches-6.6-47.base.tar.xz 2606912 BLAKE2B
9ab2547e43d9d17ce67824dbb5eac
DIST genpatches-6.6-47.extras.tar.xz 4052 BLAKE2B
8cb744f165c0ebb88d4a8eb097c6f45c550d6eb984fa06902980c7276863fb6b5b7c1e760a9f6904f58178977f7e10a12626a20f83df4a2121379a26d1182ca7
SHA512
9f7c53624e9ca9bad3f36a114b3da3aa5d3c1a7c92bfb85d862814900303a58d2a6280a9ab9a0c3f342930a1354b579e94cf5eecbb379d31c7666925c1ae9cfd
DIST genpatches-6.9-10.base.tar.xz 602768 BLAKE2B
614634ed1d1132be830e91a13dc509022a6a476b678f63dd4f3c428e7c37eec46f47a32f927f3895ff65a6ab5b046a3b0ca2df88a94678f898292d0970859734
SHA512
7826d46d8faaf64fb268f8dc940621f434f8729e706b4178adac2a2c353bccd854e5fea6c3489d5d0c48d469d6f6e26befa01d5a0deaba48f3e6140eb096de5e
DIST genpatches-6.9-10.extras.tar.xz 4052 BLAKE2B
607bede5f0c3d38f72fba841861caf6f90e7f0068373d951a6aa21a29cb7523bcd6faeeb5602c6a7395a802d35e657aaee1172582ecddd0c4143fc21ea9c4b3c
SHA512
b9e59d200cb06ea3287557e1ca1cf7116df61019f423fa8149195d36d7d2b143265341bef5430c4f761b0926ad823775cb2c83c852d22dc4acdb0d9628da12bc
+DIST genpatches-6.9-11.base.tar.xz 636320 BLAKE2B
c1a730341ca150f9f698300f59f43d1f4ab2af44745ccd060033702112caa9941a0021e23f9a470cdb0fec51e76779a20e451b2b058943c12e153acbaca4b770
SHA512
e3b40a773a2c58914b25534949f9e05542eb1712b823bf84287ed546e44c9d6e830aadd4c61d4e2a72b1e2b071387a9d1131cfc9f43ee9e26d9a14785b248758
+DIST genpatches-6.9-11.extras.tar.xz 4052 BLAKE2B
3b12fe75ae76ff17e30bb30d5e5cb913e31732bf43958b972356772e76d892823b925e715d9e777dc3ca39f89c01960b8d420d2647775d1e4406e4b82ef2c08b
SHA512
5fb378ce92f4d443ce162cd69771d6b9d150bb7be01e776c22cb913437c7b441a4474dcb33fe7d6d3f285ff0f8605b7aabd9149594d0e45ef8b231e3703ed026
DIST genpatches-6.9-9.base.tar.xz 548708 BLAKE2B
e0130d225056f77c92e566eef9db643ecdef6faf2f81e8329859830850bb5409e212aca0ab0da85b9b1e3377121221259044dac650986ec05feac46f4d588a5d
SHA512
714016638f866b536b85edd24e3e44513048591aa270dbee1460c5893b3e8b0508f299d86a202deacd10f105c0da48038d78219226b2808e17012d1811df391e
DIST genpatches-6.9-9.extras.tar.xz 4048 BLAKE2B
7be69cb63abf9df9267bc61e3e365672dbd1c0b3568d48bf949b660ff1abb483b28846eb36a162ddd9bd91473c25462440fd41a7ba3bac70467ad45fa88fdd29
SHA512
955cd846bb020d08888aac04ebc5c1e56429e11ac59601a3e068971ad05aee59b75a24722dc7fe2645ef4414424d21e117e2eeb24ae72a5949476a213f3383fa
DIST gentoo-kernel-5.10.220-1.amd64.gpkg.tar 63283200 BLAKE2B
abfa4447a66dbade52e79edebe0bf1fe6d9be7a3ae6eef0510b45b19ca6f209dd46ad8426defb9935ef10485d8704634dc45d411c2760a92af8692ba16f3d34d
SHA512
8ee2d79de3c54036d4302ac542438c73132f88a803c56159c96a4fce63fb6208a299ac3310aba5ca30c3fa504f71a60ce365a06c867d884e2da104ea57cf2eb5
@@ -80,6 +82,10 @@ DIST gentoo-kernel-6.6.40-1.amd64.gpkg.tar 147456000 BLAKE2B
f3d0ae2736520819fbb
DIST gentoo-kernel-6.6.40-1.arm64.gpkg.tar 119439360 BLAKE2B
44c090c62335cf33b40ca85fbdd8843949bf439813fba6a27347f55191ed267148d7939ab3c4e5e9d8e9235a0a16984956dcc7a1fb4dcb94b3324f77f4868b56
SHA512
3ff7488a33ede797524b2dedc1cb07dbd9de43d41d8d383256555a7705a23a91254d70499f92f3caa423e4afba4fea13c1656f78c8585004ffae672c57643627
DIST gentoo-kernel-6.6.40-1.ppc64le.gpkg.tar 64245760 BLAKE2B
55604506b9edf6307e9334f6f17244a29779eafd553a09af4afc4ba34c6ab9c75bed35f56e2f8e33af6cbd638087bc3787117c0c9aeb9d6fb483498ad6e64e16
SHA512
43ad773b3f0de197e5925685d05e4680ac84019e2dae1d3090da5f73f00799371c78d3ea6c8b48cf659eb1eaf3ab9a187ecf46e0a1938760e95425cc7e3a6607
DIST gentoo-kernel-6.6.40-1.x86.gpkg.tar 68249600 BLAKE2B
ef235d7f3f12b93e25951483f764b02e015bc1a8d50976cc256f7575a168d0a641ff00b7daf8e9dd7f50d3d5b9ea85469dbdff9646bab9747afdd44f675321e5
SHA512
2607b6610f9299774b4cdb08518ccb7808637964d49da2801ea01aebd7d6f7356415b0d93a4a51a3535a0d9bda5782363833ff998083fc7c59fedaa867623285
+DIST gentoo-kernel-6.9.10-1.amd64.gpkg.tar 159416320 BLAKE2B
2d335be253e2313e6de88cf64a21a8ff76418729f481dd67b8b3fc69bab8986cd4780e2a17a4422550c75318b02598bad0ddd704d238122d594621f5abd9e3e7
SHA512
52e918b4cbdd085461a09e73b887712a918f41da081331ad53dc57225933537cc72afd870adf411201b9ac4df49a500bc65479c507305ef2bbf8e714c7883f08
+DIST gentoo-kernel-6.9.10-1.arm64.gpkg.tar 130068480 BLAKE2B
eb1455d1a444a45db4c7148c61c2be13bcfc6d723683e311a1ccba50ab0beef1f5b93f207717b25e0e1c74020ba6daa1d2c42cc70ff983038eb9ba1628567a9d
SHA512
a075ff588892e965ad3c1ff18cf770fa38da7ecf2769526b518088881ea1fab406ab77b5a40aa3e5c1925748fa91d3d2d1a4a8fc99df02aa711c3e5e8b371319
+DIST gentoo-kernel-6.9.10-1.ppc64le.gpkg.tar 70748160 BLAKE2B
b3d09062b5ddf3eabff8ca1e1844eb445dd2a7a910356fb8799c38b000c7cbde64f259bf09ff6fcf6bd0b49d2ad87c9faa54581f27505dc7dd4c4f3cbfdcdb4f
SHA512
41b46556727e57f325e204763cc98eab0627e0bbb00eb7dd054aa9718e61fea49293ba0f858b3f47e723e914b08c0f3785892e02b6d9e9abad1119fdac758bcc
+DIST gentoo-kernel-6.9.10-1.x86.gpkg.tar 74895360 BLAKE2B
fd12759766b8d86d7356c10b3957748c9813e41ea861bb0f197eafdf258a338d8fce7f00f8cd65fc6bd4d12047dc6bbfa73a52e58e9f8ff92e60ee48443fd404
SHA512
59ec1c1506163cc76c40b726b3b9c2fbef29c5addff205ece6b15e58e553114b9299903a8ea0e4d58399ed94e4f3a6eedba3c785944fff2e1d571d09bb725d71
DIST gentoo-kernel-6.9.8-1.amd64.gpkg.tar 159160320 BLAKE2B
f54c76780fdec033d8ce5b419dfb8cb1d9fd36af80791532ec7d6bf5ac4472f1fff6f52151aca93cebf3f99ba569b990a850403a99b56d427b6a48a32350b735
SHA512
ddf33e3b2d19a1beadbf6e578a70f363e2fac965dc19c2fcaf4a73b768f27611c86f1c3ec2a472fe37376fcdfece48a53846ff3ca554c97d4eb9686055c1a758
DIST gentoo-kernel-6.9.8-1.arm64.gpkg.tar 129792000 BLAKE2B
7df88f8fda6a34699ae60ad3c12e20fdd957a8a07bb0880a634a94b91b5d803d35ac493862ff35a85426b62e1d8c7affd4728aa87d5e3d911ab73b39c1dd54c7
SHA512
b27e2854f7b5a5b4a179578c6228c3a11c50c7deb37cc0ae8bf0c1f8bf60c64a8990fd09111769c642072079df6b1b083ce305519212bc3816bcccb6ee89ecad
DIST gentoo-kernel-6.9.8-1.ppc64le.gpkg.tar 70758400 BLAKE2B
782a74d7edd731773abdd128adcf720215c5bb7ee7dffeeecc9bfe0f04b0500584f69469277f5f86f9d4ea447975fff26403b680bc52b1d3e21e033f54cde94a
SHA512
923badad678f818ff30fd753508d1bd53990a1c3166879a01dbc1e841355fc783a6e9c79e3d5a9ab075f223828f7206decd1a36fd2370a4ecfaf354d5821abd8
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.10.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.10.ebuild
new file mode 100644
index 000000000000..1503fa4fb5d1
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.9.10.ebuild
@@ -0,0 +1,164 @@
+# 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##*.} + 1 ))
+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"
+
+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
+
+ # 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}/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
+}
