From 7f376ea44cc0fed3d9aeaa0e5630fe55be2a9f2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 18 Apr 2026 16:11:06 +0200 Subject: [PATCH] sys-kernel/gentoo-kernel-bin: Bump to 6.18.23 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- sys-kernel/gentoo-kernel-bin/Manifest | 5 + .../gentoo-kernel-bin-6.18.23.ebuild | 233 ++++++++++++++++++ 2 files changed, 238 insertions(+) create mode 100644 sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.23.ebuild diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest index be771ea65a2b4..a50278ffd5e95 100644 --- a/sys-kernel/gentoo-kernel-bin/Manifest +++ b/sys-kernel/gentoo-kernel-bin/Manifest @@ -66,6 +66,10 @@ DIST gentoo-kernel-6.18.22-1.amd64.gpkg.tar 477040640 BLAKE2B a376271369ee9dd967 DIST gentoo-kernel-6.18.22-1.arm64.gpkg.tar 450918400 BLAKE2B 30ff437314681d203a32e819be7601777d277f9189ef30428849be9efb0e1a0b1f42d2dd72c1528e2e08762bca803395eefffff510f66775bf959b64be7be07a SHA512 86c53cd703e8724cdb8565b0aecd31549c533773922fd94bcdefb30b26a6410a0ec1fd3b80914f3e92e799fa9f585fc52152562c3d5fdc094ab75d90ccb87036 DIST gentoo-kernel-6.18.22-1.ppc64le.gpkg.tar 77148160 BLAKE2B 5217d3f521483ae7c961f8a41057f0df0c4e982586152bea34ba1e58a792cc3a54524959544a448ab0a1bddde14796a41e31fb11bc7dde29b31162408efc0408 SHA512 7a524728c7350edf8c96e0a16cd8b6bac7cfd17d30bd077c2be5aa4201753c933e0ef1d94f244288cb23e7ee1aeed6e68404f59aafba7efcbe1ca78ef73a3224 DIST gentoo-kernel-6.18.22-1.x86.gpkg.tar 83548160 BLAKE2B 07810dcac722539b4a9fba944226c7377da49d06c1189bc0f3538cea88a8f1979d9b330a446a73d097d0a1cf9c0cf3ea7ecd4331ca3dfb6b160037f45bc34ed8 SHA512 39b8fa0c745174e7d089b97bd75c0a21f7ff934950066601d086ff0bfe01b8e0ab1c542f7f58a8505c4b89a356ae9759463f0224f282d35a8fead6076eeb7ed2 +DIST gentoo-kernel-6.18.23-1.amd64.gpkg.tar 477112320 BLAKE2B 5f3bd172dc7aceaedb510596c39157d2ed960b64bcc01d43b618723771777e63016237c17456b289a6d655066d149ddc7fbcc90b0fcdfc12767161939aeca863 SHA512 700bc81fe1316855e0e78aabb0b004727cdd07b686f2226ee56435f277b4c30dfb53d301a00e20514b1693151ed26e3af02c6e187139d1d118fe7d7ef5b151a6 +DIST gentoo-kernel-6.18.23-1.arm64.gpkg.tar 450959360 BLAKE2B e3dadfddc1544b0d81a6bbd4429a107b84aedc846ccd9e1c97b45f273d3e647a30c3bdeb16dbd72b7642e6c637e552f2a83f2245c8de7249245e7c16734afa03 SHA512 1b2da096efca700f41ed825d129797c57fde00720e0a44912afe1dd94b9346d4c46e4107933a4a3e0eee8eb063b23ddd6922114c378d32a0630ecefcc3a89ec7 +DIST gentoo-kernel-6.18.23-1.ppc64le.gpkg.tar 77168640 BLAKE2B 3e910a9eb58cb122bc0bfc275c76b60d14ec8a2381c5fb876c1866a3fe5b72017116c0a315196104403f273a170370e1971cf7888b86ae823f10ef94033177e5 SHA512 78071db3ce6b1a0b980910a9f00c5e28fa07556a73d9a888fecd0bb42b9f453688c672577ed546944ebf16b01deb041a677782b6e8c207cd50e59de5bbba8e38 +DIST gentoo-kernel-6.18.23-1.x86.gpkg.tar 83558400 BLAKE2B 84183a5d8d3a4350bf0f5efb119fd4b51ebfb21fd8850ec74d23f106181862d809bd7e6c71f2b85e2528cdea0a7e6a8ce07c8bc83922e999ada7e2d8e5ed25bd SHA512 014e1b17113e6595bdc14253a1af4262ee2f73d914cae1f75488dac52a4cb434991849dc7033f66bc4b243449d81ae1414b6f91571b689b6bea5fae4a78ca8da DIST gentoo-kernel-6.19.11-1.amd64.gpkg.tar 361226240 BLAKE2B 3d5cb56b6e9d90622d5a58fd917d9eee5ea72b9bbb2aaaa9a8ed7cb6354dee6f970b6c9624d1520434d1e20b64bdc5820a1ee8fd92e036500f6f1bfa3436ee71 SHA512 d6708c1e85b7ecf9b776362e8c42dca475a28ed9568385c6d21789be113add77d63a48f385bc397642822da98da3c574d1fd2107ba20853f29a837b7e908116f DIST gentoo-kernel-6.19.11-1.arm64.gpkg.tar 319313920 BLAKE2B 65469006e8ce0ccd156320ac38ea4c347c6b14e3f696248a12642b60a93b92a6f31baea26e405162af1e05b2677a376dc36ae1bb217b9467545da8b3420c736c SHA512 ed5f598b5908c5e219bf44e380ad3f4ce73c3847c288e2679996253574c59ccf2b7aa4673c3974e2f8c9d8e164d6d9a7eca95b4cbf5e398d422815a4f52600f4 DIST gentoo-kernel-6.19.11-1.ppc64le.gpkg.tar 77967360 BLAKE2B 59d646d473af53f889bb335f62a3eba39c8b1dcd1ffea6f742c3304b4b11f5d839d3f597eef32d19276ad949903e37206cbf55700b928861aaaff26da2e6c323 SHA512 d5129d8ffe010b5a1cb0f947f2e0d75f2b02c0e13a35b7c06adec24b0f470e375febe0434061512a90d940a37b5ec262c3f00e4cc5193011822d8aa7843fc4ba @@ -136,6 +140,7 @@ DIST patch-6.18.19.xz 1261900 BLAKE2B b39f17eedc96c9388720b877ae76796b4d75e02976 DIST patch-6.18.20.xz 1310844 BLAKE2B 7da00fb985db1a29e0da0c957b015b6acc65dda3ca7b26c227cd9bf83f9a8ebb720950b19ac14bf78bebcf317ce5e73dd5c4034ecd120da483613f99f1e450c6 SHA512 c8488e95355a9d036647b14f7355f607b5b0680e74f0c73730c74d490cf2c6df5128512a04a97a78b31c8d668990225fd9bd799de4e9907aa8265398f900edd3 DIST patch-6.18.21.xz 1382072 BLAKE2B 9eaf6bbb97bfb7c7463dc904d65cfaaf67212106c81022e87fd0b766178f865a4c705a2c0430ff101c5fa144d22fcb7c0bf686b12a475249cceedc5ba2a0fa6b SHA512 d9fa1744a674a4666bb5904c899fcb2cfe1e3a8b0a00190fb71ca6346b3d88b36fdd45af17b6442754e996f5bb5510b94aa6db5434291f40e7d799767273dfeb DIST patch-6.18.22.xz 1461196 BLAKE2B cbf351ca526044c0e5c69053235886d2167173e24ae9c1887cbc96a286f389ae417a5c6c07ad0579a3fae5adcec33524ea811a2f1179e95e90abeed3bb0b5e21 SHA512 8171287486899d50262df42cbbeda81db86c3245334799f5517cb4f01fb2095bf6e27ad95abe01be635bb9992b20647a5cdbc6e19cd8cdf9cc8bdc6aa62509e9 +DIST patch-6.18.23.xz 1482688 BLAKE2B 798b9878667bdc825ca0435460ab910e03e8fa9002ba11fcfc68cb2cf5f34b109eeaa6ab5e76ddedf66cbd8e4901bb8bae892c3eb8a9643bb833c28b9adb59e6 SHA512 8973a9cae5bf26a1614351029ed4279469a4dcd81c4cce5da96ba394b8806a27da666f0c8ff001255b5430b06bb70bdb49352f6e41c70d0c33e3c5c108b9bf20 DIST patch-6.19.11.xz 864748 BLAKE2B 2f94e7aeb76f0aebfa26e159bd6c226f31335b3e3d3bc71f289587394d53ba461ca1088d0a24fda4a9920393727d41de0700de588399d80dba843d7fabd32dca SHA512 c68361a19d04529226beb12cdd3a764bdcf481dbad342d5626d83412a00857588942308e880a92fceac31c79fe6f389bcf7b1f171e7c57b0110ec2babc0e24ae DIST patch-6.19.12.xz 948944 BLAKE2B 155a7b412f7e0699c6b23cc3a53b9ab0fe38980d9ece77977f50c51f748cb79e4076fde7eac574ee68a85dbe661a4e6bc10ed5a6cb5b1fc5fc3b1ec150f25757 SHA512 375caad1de11ef1466f7e2fa85775e990f215bae0e269d4a97661c936f633df40c51af849880ef05c4cd323cf1d27804b72222cb12df98af021623742e000330 DIST patch-6.19.13.xz 971152 BLAKE2B bfce48d0a448eb67c6d5dea4addde726c01e9496673786aea92f46b1f08a7c0f9b06b11d268704ca2bf8e91be210fdcc4b72807f56e05c03b948b63061f48fe4 SHA512 73af97de603a768269c4d76a7151ec1e03ba612e6f68af4fde3e14e7a7798f8862cb21140ca2eaad59c5d70ddf541a3af6cd76d5dd529eaa78e8dc111fdeaeb4 diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.23.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.23.ebuild new file mode 100644 index 0000000000000..e101c835f3136 --- /dev/null +++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.23.ebuild @@ -0,0 +1,233 @@ +# Copyright 2020-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +KERNEL_IUSE_GENERIC_UKI=1 + +inherit kernel-install toolchain-funcs unpacker verify-sig + +BASE_P=linux-${PV%.*} +PATCH_PV=${PV%_p*} +PATCHSET=linux-gentoo-patches-6.18.16 +BINPKG=${P/-bin}-1 +SHA256SUM_DATE=20260418 + +DESCRIPTION="Pre-built Linux kernel with Gentoo patches" +HOMEPAGE=" + https://wiki.gentoo.org/wiki/Project:Distribution_Kernel + https://www.kernel.org/ +" +SRC_URI+=" + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${BASE_P}.tar.xz + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PATCH_PV}.xz + https://distfiles.gentoo.org/pub/proj/dist-kernel/patchsets/$(ver_cut 1-2)/${PATCHSET}.tar.xz + verify-sig? ( + https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/sha256sums.asc + -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc + ) + amd64? ( + https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/amd64/$(ver_cut 1-2)/${BINPKG}.amd64.gpkg.tar + ) + arm64? ( + https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/arm64/$(ver_cut 1-2)/${BINPKG}.arm64.gpkg.tar + ) + ppc64? ( + https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/ppc64le/$(ver_cut 1-2)/${BINPKG}.ppc64le.gpkg.tar + ) + x86? ( + https://distfiles.gentoo.org/pub/proj/dist-kernel/binpkg/x86/$(ver_cut 1-2)/${BINPKG}.x86.gpkg.tar + ) +" +S=${WORKDIR} + +KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" +IUSE="debug" + +RDEPEND=" + !sys-kernel/gentoo-kernel:${SLOT} +" +PDEPEND=" + >=virtual/dist-kernel-${PATCH_PV} +" +BDEPEND=" + app-alternatives/bc + app-alternatives/lex + dev-util/pahole + virtual/libelf + app-alternatives/yacc + amd64? ( app-crypt/sbsigntools ) + arm64? ( app-crypt/sbsigntools ) + verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 ) +" + +KV_LOCALVERSION='-gentoo-dist' +KV_FULL=${PV/_p/-p}${KV_LOCALVERSION} + +QA_PREBUILT='*' + +VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc + +src_unpack() { + if use verify-sig; then + cd "${DISTDIR}" || die + verify-sig_verify_signed_checksums \ + "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" \ + sha256 "${BASE_P}.tar.xz patch-${PATCH_PV}.xz" + cd "${WORKDIR}" || die + fi + + unpacker +} + +src_prepare() { + local patch + cd "${BASE_P}" || die + eapply "${WORKDIR}/patch-${PATCH_PV}" + for patch in "${WORKDIR}/${PATCHSET}"/*.patch; do + eapply "${patch}" + # non-experimental patches always finish with Gentoo Kconfig + # we built -bins without them + if [[ ${patch} == *Add-Gentoo-Linux-support-config-settings* ]] + then + break + fi + done + + default + + # add Gentoo patchset version + local extraversion=${PV#${PATCH_PV}} + sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die +} + +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 + WERROR=0 + + 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-${KV_FULL}" + + # If this is set it will have an effect on the name of the output + # image. Set this variable to track this setting. + if grep -q "CONFIG_EFI_ZBOOT=y" "${kernel_dir}/.config"; then + KERNEL_EFI_ZBOOT=1 + elif use arm64 && use generic-uki; then + die "USE=generic-uki requires a CONFIG_EFI_ZBOOT enabled build" + fi + + local image="${kernel_dir}/$(dist-kernel_get_image_path)" + local uki="${image%/*}/uki.efi" + + # Override user variable with the cert used during build + openssl x509 \ + -inform DER -in "${kernel_dir}/certs/signing_key.x509" \ + -outform PEM -out "${T}/cert.pem" || + die "Failed to convert pcrpkey to PEM format" + export SECUREBOOT_SIGN_CERT=${T}/cert.pem + + 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 "${BASE_P}" "${makeargs[@]}" modules_prepare +} + +src_test() { + local kernel_dir="${BINPKG}/image/usr/src/linux-${KV_FULL}" + kernel-install_test "${KV_FULL}" \ + "${WORKDIR}/${kernel_dir}/$(dist-kernel_get_image_path)" \ + "${BINPKG}/image/lib/modules/${KV_FULL}" \ + "${WORKDIR}/${kernel_dir}/.config" +} + +src_install() { + local rel_kernel_dir=/usr/src/linux-${KV_FULL} + 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 +}