commit: b4b89d961ba32156501d89c7261f16c619fe4cb4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 19:35:08 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 19:37:01 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4b89d96
sys-kernel/gentoo-kernel-bin: Bump to 6.10.7
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.10.7.ebuild | 170 +++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 617e57834156..e0c69511f827 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -4,6 +4,8 @@ DIST genpatches-5.15-175.base.tar.xz 7264676 BLAKE2B
6911fc0fcef31daa55ddeb93e12
DIST genpatches-5.15-175.extras.tar.xz 4060 BLAKE2B
1ff5b5e69f9cb0e243d03d761c430bcb04ef698199c6a68e15c9535cf58b8fc0b12703fced2fd1e884c7c7d7b948b778f633d2a5de619de9a0acee60ef7c20a7
SHA512
8925f59f2d30f07838ca111c45496d7fa0229362065fbe6643dcf6dd0998ee747a8d8ed217a63b6e77b28d8b0775872408fdf8260e6c737db3a4aade0f299041
DIST genpatches-6.1-116.base.tar.xz 5862440 BLAKE2B
57df84154c9302bfc602035d8b06ec4b8e2089e8529d8a425c6912c46ca5d7f5782e60efc1600b085a1e60f4f029376485aeeafb6890bab20901df152c18bf25
SHA512
7467a3963981f8862a0898f4baabf95d25c4bc13eb5cc41b28307d48150bb263cd34be392f6e0130e053105f385ae963b03d306268c9eec3cc0e807cd3e56a7a
DIST genpatches-6.1-116.extras.tar.xz 4060 BLAKE2B
f1c06b3d9f005cf93a317e051104af5a5838dda32e7d480d67655d26afa636741053da4e3c39aae81593cc12708d829d4a8f9e167346d6b038c4b72bf70c9626
SHA512
3ff2f66f10a0158c9890ba629cd0d0bea46fbf5ff899dd4a0dbdb70c5aefb2ab0ce89c316a76441d0dc500e740f79b15568209a4f97b82a1efb0ef088ea00d36
+DIST genpatches-6.10-10.base.tar.xz 490332 BLAKE2B
6311b976880a1fe3cb902ba6e4d39890aa34565c6df19fc01deb7b337304418d1ada38d6d83f27acdeb3062fda65d7996a0e6988799a6789e81372a0966f3caa
SHA512
3748322f9bae147f3ca68693dcabf21a4a969032cfb36aced11bb883907cb663d139175ed4dd7c8e87ea7628f875328e3b25d978009ee3a6989eb38b1c7c4ace
+DIST genpatches-6.10-10.extras.tar.xz 4056 BLAKE2B
edb14475e8c07f04d54e6953f8518ea631660ffcdaa8797eba19768b3a193df51822d508dd7b360ced634d0045878f77996ba765498bca3bf001d9a4c223fd8a
SHA512
a0379c1ecdbb7a8d6f3b3f82db60d5fd7503598ac26c2f11f6f549e360a648053896cb8db235257bfa7bcad251c90c6dc38116e238c0e2447117eab83a42b4d4
DIST genpatches-6.10-9.base.tar.xz 401220 BLAKE2B
3335d5d29c347526cea6104b9cca56b8ed8ee0f1de9ee8a6f55d66514df829fcd197b8281b2261f6dfb979276b65bc654d4b1257868b5b80a2411fbd2f076f11
SHA512
9d2319c2b86b80355464d661f675a331a4245405bb84184a4d061649abdeb5955b6ebeaee1cefbe3c669f810c9da645b7fb637af4dcb45cb9b69e715c6e46f1f
DIST genpatches-6.10-9.extras.tar.xz 4056 BLAKE2B
2cba382236beae6374462f6147d6e164314cc8f7d7be87547902153c035b970ada27f4817a6de2d569116118eea0d95d42aa44de2147475c47c732abfedd9952
SHA512
358d82794809d49f4b24bdf10c49cc4fbe8ac0a45f86dfdc018d2c778b757c002d9bd129d935146b84daf809e95f5235fccf7466d2498755154b9c77e5a2b46d
DIST genpatches-6.6-54.base.tar.xz 2922380 BLAKE2B
f65404127bb6547208aeddac1996a4a2659bd99ff7429bcaff28247a867c000e962457725eab80db2c76297f1e5c27806dc6fb23e31d5694b6df783e65995227
SHA512
102f721f87478ad18599bb5ff65cd236180dd3d9d058786a5306cb36be3f30a2d2ef684e83b6f458d4de78a196323e87d346eba704bfbce733010aed6ac3d7f9
@@ -24,6 +26,10 @@ DIST gentoo-kernel-6.10.6-1.amd64.gpkg.tar 162723840 BLAKE2B
b06364ac6a1cfd4cda5
DIST gentoo-kernel-6.10.6-1.arm64.gpkg.tar 131993600 BLAKE2B
bf37c8d5a9ca3dda972cc7a08feaf12b22a880216767892b9f95550e9b31f7e824b74658bcebf10343ef441c6e1d2e4a28145d927f19ec644ea4246cd1136d55
SHA512
3a72d06ed8fc7edf1ef6ed702940cceeedc16eb9ece430cc0c0faf34cce36a0a9ee18f90471cefd0a6a6e87e286855c98f94799683c22be3cc14b3a1e8350032
DIST gentoo-kernel-6.10.6-1.ppc64le.gpkg.tar 71976960 BLAKE2B
78f76bb3fc5c6455d99a9f55a82b2b9cc8a07529635e3302e9a7f02aa0e869f669605d93e63b151ca5eb5014915a7d5be64a6c0caf0c10a322dee66b0456617f
SHA512
b20fb195cce8db548671b4622319d50d751955a80e89f0814253879112fa8943a92df195eeb2e6b65f14fe134caa5e514ac18f5457eb41bdde2f98b2fad2c25c
DIST gentoo-kernel-6.10.6-1.x86.gpkg.tar 75509760 BLAKE2B
4c5308819a12a95daad5c4a082a8d8191062702363b6a6a5fa13ec3741b8df259912454e8fc51ce41d8dc79df3d0e79dc848c5b10d5be6dfda4c7625c2f8959e
SHA512
ee7c1fa6d60760333c4b18df1e25e534e7f2fb7b52754d043f6df80daeee6c2d47dc4ff042ad295095d61304f3ef4036cc62cc5d08a1fb9ef29ca3ca451dbf4d
+DIST gentoo-kernel-6.10.7-1.amd64.gpkg.tar 162672640 BLAKE2B
1c8b588ce05e029d77a38b224fff546a68072c26314dc27fbc7a7fa1902aedd6b9621c61f2faa62504db2d6e4c1ab30a6ec09ecfbb729bc654eed6581aceaf11
SHA512
0e2cd3272df3232a2273b561e41b525d2555cd67166351039fac1bff2934ba039c4871da33696b36680d413a5eaa2ef1575b0e116e14217ea945cae35291dddf
+DIST gentoo-kernel-6.10.7-1.arm64.gpkg.tar 131983360 BLAKE2B
801e0957129026fb0ae183ee50b1431c6619b1e97c64d99ac656dec59e8888fe3d59e42beacd64b58d49d89883cd1a2fe1e1414592ba83bed39805935a152b4a
SHA512
d85b0b449f7d2b8b6d0099a505134158c26bde84f62eba8bf9c231c522e8673dfe4c10246f351580af9120b10f0108044df2936770a15a8c0817503bbfc72973
+DIST gentoo-kernel-6.10.7-1.ppc64le.gpkg.tar 71976960 BLAKE2B
2e0de6ddc3cf5caa12dbb56202d6f932e5866ee2ceb07a8681748b06f7fea9f2e3e5389552e4ff9bf2edad7e6bfa2d6ceb5f7dccc8288ff58de22c274533109b
SHA512
bf34c8c22f454af4cc2ae249919d4d216d8f3325e424d80d97e6443ac2965d6de97d806321842d32a72197b02ed22cecb314aa26f1cdf6aaa3fd9ca60c8e14e0
+DIST gentoo-kernel-6.10.7-1.x86.gpkg.tar 75540480 BLAKE2B
a67f58204ee8d59ac9a1552842c0e45e16831aa722e5d1e060ab9b0b70c8dda0dd9de15e66cf27b949aab138eb9dc1aefecfb01afa4e2c138d9c6b0295b8499f
SHA512
0d28ac05ee1fce63f6e5a26a7521d00ab99f24a0e1b3653d44ddcc533261f5ee5c003c20f811b32b14a15f3c8f674bb4b8297b4434f1326b9e3e303f9f498c2f
DIST gentoo-kernel-6.6.47-1.amd64.gpkg.tar 149637120 BLAKE2B
fcee3f615fe143b8b12d741bf0df758f68c607b0315ec054c6c804d7999339fadb5d62c355ad6e110b5633e8622a4b8f075bd3aa93d40f22fcf00b6b4b2ae7b9
SHA512
18ae1954bc9c10404a201fd9d511521f6f9ba9781f994e8d0ee082c4edc2908125c4db59a38fb672e492bbc8363d4c90f7d3ee216cd5e8dc5e7b0aed8362555c
DIST gentoo-kernel-6.6.47-1.arm64.gpkg.tar 119695360 BLAKE2B
9bc6ae80d5e41bf39577a6c27cbf47f550c33951f19fc4f9c46dbf15a181593f20b15679f7ae33623a15cc555602ee8828ecee14900f2af14711bf8fd33fc5eb
SHA512
4079e67ae3e639b3559026c66e87f2fbe4f0884f02d0f0b73f97f16fc2547d4f599ea49a0868cb06a5d4254e378962fd21f581c430c5a5e0c4cfd782504599d2
DIST gentoo-kernel-6.6.47-1.ppc64le.gpkg.tar 64256000 BLAKE2B
cfa82483ac8a788be9b84ea9246224bce5ec2fe71711e063d6fec46286ef72d488655323cf01beea628d73f8f8e57d42452869ede0a50c57caad474f9eed500c
SHA512
2aa632e90471d8c41e275c95cd636725384958b251a4db30ee75fe2f13de4af7ac70a42fb44ef83278d7df4bf5fe5bc1e1f9f080ee71f66c6baed0a290714246
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.7.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.7.ebuild
new file mode 100644
index 000000000000..5e3ffa99e33d
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.10.7.ebuild
@@ -0,0 +1,170 @@
+# 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##*.} + 3 ))
+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 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 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
+}
