commit: d62f351d286c1ccbeac6c8096f13a87ca7674edb
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 23 17:31:26 2024 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 23 17:36:25 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d62f351d
sys-kernel/gentoo-kernel-bin: Bump to 6.6.18
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel-bin/Manifest | 6 +
.../gentoo-kernel-bin-6.6.18.ebuild | 161 +++++++++++++++++++++
2 files changed, 167 insertions(+)
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest
b/sys-kernel/gentoo-kernel-bin/Manifest
index 77fc8eff7ff3..3909c771e5eb 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -32,6 +32,8 @@ DIST genpatches-6.6-22.base.tar.xz 1119612 BLAKE2B
e0e5cf468f1bfb7b76043b7252806
DIST genpatches-6.6-22.extras.tar.xz 3704 BLAKE2B
c09db6ac1f713f404001c38c650731a0c8821c844eb7638b072cc0d135575df4f965cbd7c99c0261cc1021f97459266b20f153e428ba7a3b7973bb6453d0ceca
SHA512
dfe66f78ca064ac0d6878da769dbdbc568db35bed24c8e2388bcc9a1ee63adef1e729ad9a3e737b5838c6f5473a7b9c6a6b44f97e95a900efbbf9562bf7462b6
DIST genpatches-6.6-23.base.tar.xz 1164692 BLAKE2B
d42ccd9e636a413ffdbdb7dac699169f38b80617234b83b6ce49418f7dfd568f6d6718ce97a42b4df2f3ee1efa81df1a02102c123b88603dc558f72dd18af7e7
SHA512
1671b5d07294f73fe547a0cce8df38b5da78dc1596aa136190bae38d9eddc8b896c34e778eb80971336caa851c7d6c7640a59186cf1ecff26b89b69bdc9fb0da
DIST genpatches-6.6-23.extras.tar.xz 3704 BLAKE2B
899c859be865bde37c41a2a24f1132f803404908002e0f01f28629ae0a03c2e1979f5239d495720c6de3ba7ba6032a5f74ae0e23bff10fe37f6f7ba31daab01c
SHA512
2ac88f95177413730b0668e0a33f8b27e04d9f7c42ee6fb2c9366efa06c95884e4b80ce3631105b73ae8b9ede0697b4859e92997e5059688698f96a0a2cbb129
+DIST genpatches-6.6-24.base.tar.xz 1263296 BLAKE2B
16caebdd68cdf1d07c5f0e0429ee0fff5b95408a41bedd55c3e44b53fc242b73998020d781d51bdb35e42b680c4fd3f4cdbc6f5e65977ad099691ac2b25d5fc0
SHA512
f6cf1e79a6d9c4e050602a1bb5a41266129fa3b93250b158fce55a7df5eceb6134950816c055134310fa25f0d878afea11c9bce8950050f8723b1178896adcd5
+DIST genpatches-6.6-24.extras.tar.xz 3704 BLAKE2B
2908fc01a54469d0b99c12b76e11a67af3251391e5f6cb7125a63d54abb681acd11f54ea26702e964a5785fa1a2557111ab9bea13c4e9a32cf4549c246b34edb
SHA512
f72cf8aadaad8cff309a6030e98e29534e86c75665895d53772d3fa783df2939d74e449e1e0adb136349f7e281cc158153380d862cbbf6a3ac4916ef4b8da6e0
DIST genpatches-6.7-3.base.tar.xz 19844 BLAKE2B
69f53a7bf61154f3644919b870ed4434ccd7ceeeb8c57e14c274c7be28a1f6c5b0af7975f4c0ef131ff5b53f3afa0a1a4b7c7db92202e11e3c1647524e8e9444
SHA512
5022aeb1970e8652b5f82d09642c22970bcae0e01deefbc0271cab9c054bd21ae4c3835f4fff0a22d14f5fa7495211a95c50b35535586dcdca3c2b1f45ce05a1
DIST genpatches-6.7-3.extras.tar.xz 3700 BLAKE2B
ce7bc87494eec57d39330b1de3462b99a088781bca0beefad667674bbd9eaa2f2413c712638d16ef8c335b6a0e353aec83f4eb69e3da53a88d51ca6853d3254c
SHA512
43558eb7a699d5e24c8f2bea13689adaacc6c7c58b4975c3d204a4c2278620032add6ca6017c3fc6ae70ade7e3e227a655deb989b85ef05acb05804d33475ec6
DIST genpatches-6.7-4.base.tar.xz 193776 BLAKE2B
d0b6ee8e055d0c3b8122e1050818b49600a94c8b1b06ee4b6209d89207d527fc6c65352c728e359ad2830830ff25079a2d6d6ef6a55ecf60e43887c16673376f
SHA512
5cc15425a7e9e80320f0b18b891d2efa2dfab4090441003b3c617d820c7e449a792aa266941bde0d22ba26e9a6999e42c3b686b270bc00389047678dd71b93d0
@@ -112,6 +114,10 @@ DIST gentoo-kernel-6.6.17-1.amd64.gpkg.tar 146083840
BLAKE2B 88bf4771a973f2a5e2a
DIST gentoo-kernel-6.6.17-1.arm64.gpkg.tar 118784000 BLAKE2B
5fed9d7a20331c40a21de2886a8e89135392e836cbed269f520311a4904192d909c68388c91f3f8af48a5a76a925d50dc472ff7da1293021faa3918f5b56c90c
SHA512
899fdf0d48033fba6ffbc113a445b62cc119c79333e5f42648345ef302d2cf2ec5412e35826aac348c8990e064d8678ecca6baad4bf7d664268dcc612c7c0fb1
DIST gentoo-kernel-6.6.17-1.ppc64le.gpkg.tar 64358400 BLAKE2B
cd8c95cdf986147a8c7568af9a1d4d01a621c6a6937c5156025a4d3cace91651c3580347bb29fe5aaf06806c0ab881d268ea2ee5f91530f8210ee0b6cf7c982f
SHA512
0d51b120a67c45d519320e8fb26a7fb622c8f3018635c392604cfafb7c9995ab86f6cfeb4f47db139cddca469935fc50ee7eb9912763d7cb2b2de35397bccfb8
DIST gentoo-kernel-6.6.17-1.x86.gpkg.tar 68311040 BLAKE2B
ac84fa2e163a8d69c3cde9d5c0cfbd31417d185ae399286cb84990f39cec9a97f93869353b48e7ac3107171a4a7c8af77e1032c789be0c45c7bcfbc7de839e22
SHA512
61cc96faf2aee1361145eeaf2d6a4f144fe13bfd3f49e7927ab96f64fc49728bb179bd34800fd6cfc7ba4b89e7b6b9318ee619fc6a123e2630afa6ff89d1b8cf
+DIST gentoo-kernel-6.6.18-1.amd64.gpkg.tar 146462720 BLAKE2B
4aa3479b58e6b67fd775cd1fed74bd4ff96c88bef16e86768c8dea5a8dde501bb7efffd09128475d1db74d8487386437d57a1d6efb2e2f24d587801eb84f9b3c
SHA512
f1a20cb97b328071b96bd8cad35a20dc1628594dd0201b652781612b1b9db191ac4034e9b3319ba4fb816f215681b177b5339451dec44dceda1b55145dc50fee
+DIST gentoo-kernel-6.6.18-1.arm64.gpkg.tar 119244800 BLAKE2B
cb55bd813459db9e3346184ff2761ad9a91afda08eac32aa575aa9f4d3c1b2de9fabf9afd89f91207af6b9802edf9e5ddff695ebe29592d707877a61476a43af
SHA512
c5db24da4f8334bb35592f29d75c7623626ec93339eee45e5d629f568d8289e169afc3fd8a0c6d2f194d71e86ef600bd0526c63f9e245926a6a8d5fd1298f73f
+DIST gentoo-kernel-6.6.18-1.ppc64le.gpkg.tar 64368640 BLAKE2B
4c335e677b3f6690f00e3b59bc1266761dd88f8efd00e3f5598bda84667694c1585ee5132aa17dfe36799c6f05312520d9ce9544be771ebc730f9c0f529b3b94
SHA512
fc470fa7e0332e38e534584e9578edb687cd089f82b6f196a469db869930dab2610c0994cc4a62cd771cb3e1ef719bcf73b3c4bc09c2bc0530d37ac2a96d44ce
+DIST gentoo-kernel-6.6.18-1.x86.gpkg.tar 68331520 BLAKE2B
be6881c2d7f984ed8d28998175ea3e23cec4deaf8b2aea6cd364a848de9ac0733def3a70b5973eec35b55a34e1fa1b62c0ade50b85bd02c06e39d015689e5cd0
SHA512
1272df0a15adde539d6dc80060bdc3e8e350bda0008b0e798fb7c5a0fbc81fb8e0cb57d1985fab5244a2ee3b249b8ec679dbd95e7695edf2383656107454af4c
DIST gentoo-kernel-6.7.1-1.amd64.gpkg.tar 148244480 BLAKE2B
331554d8368fbf7e066e57859875dc04bfed10e1b7d937ef149af894214e6a0350f43f8c3b87fc3590e01f7eab3c5b94fe03a5632bb606fc435a0f63fe06fda2
SHA512
c6e5f6646669e390b06db010ab2e30a803a3d15b7f898b45c565cc58426161f4c9f12529e8d7beedec57c153de0cd9c1a73c25099c5c75a0ab66e2730ce12f51
DIST gentoo-kernel-6.7.1-1.arm64.gpkg.tar 120647680 BLAKE2B
1ec1a5470c5f97bfa12e4e90ee58aa057c96a120ad8acd0fe62f858f8b685ac19f0759e76bf6d435243aa1b9d3dcdee4457b05eef2e2839b6d3589b38269dfab
SHA512
35d41bf8df7fb65f8838c74d55afe005028af686859833e4bec8a86b061a804e48a425b77f222c3551188ccbd7b51b75491f5a13b69dd895cec9fc6405d59316
DIST gentoo-kernel-6.7.1-1.ppc64le.gpkg.tar 65484800 BLAKE2B
c0dc567e77b591a0d93a94d2f9f07f091f48ea5dee481d47dccd7b148617be56cb38d6f89da010bfe344eab0f396f556221a9e6df54a1353c4fd6cbfb9dba4f7
SHA512
04cf5db20c604999aed94e9bf3d69b546b6247a9ca68cd1bc187b52ef82b4c890538d5aaa976ba596224b2850e63505ae3fbab8f569e7f0c030569469e6ee302
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.18.ebuild
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.18.ebuild
new file mode 100644
index 000000000000..b0e3fe1f8248
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.6.18.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##*.} + 6 ))
+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
+}
