commit:     852e8cca6b1c9faaa6b7c787a12454f0603978cf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 14 05:15:27 2026 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 14 05:15:27 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=852e8cca

sys-kernel/gentoo-kernel-bin: Bump to 6.18.18

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sys-kernel/gentoo-kernel-bin/Manifest              |   5 +
 .../gentoo-kernel-bin-6.18.18.ebuild               | 237 +++++++++++++++++++++
 2 files changed, 242 insertions(+)

diff --git a/sys-kernel/gentoo-kernel-bin/Manifest 
b/sys-kernel/gentoo-kernel-bin/Manifest
index ac63954a873f..d618ec2820e7 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -62,6 +62,10 @@ DIST gentoo-kernel-6.18.17-1.amd64.gpkg.tar 476723200 
BLAKE2B 1eb71e7725e8f4dc60
 DIST gentoo-kernel-6.18.17-1.arm64.gpkg.tar 449484800 BLAKE2B 
3c6fd653f15a53488b15cc1a52e2fcfa41f506bf0d5e6c96107886bc315464a3de6f6ca0f7bbe43c0a390203a328917800684b0298130fbe49c24c86380b75a0
 SHA512 
e023259b9a9635c53cb7345853c339f4b206d4d4a024798f51d9ce37d052c36ae9796761baec788038ab9e6a51c4a450a42bf0cd2b299ac79f732d66ba7f4bfe
 DIST gentoo-kernel-6.18.17-1.ppc64le.gpkg.tar 77158400 BLAKE2B 
56c73c74c545b2d9e4d2ce51f14264a75992e9100d8d65a792315dc4a8e5de2d79c9aa51129b15a06304af5a9f5e946d22e209218201aaa8972b0e605adf1098
 SHA512 
24b1200d592e118b038b881ecba9b4878fc3ef960ebcedf238bfba12347cfc8c06dca12fe71da5a46dce4edf00c8b70c9cd6b6473c9442be30a13615b25e54ca
 DIST gentoo-kernel-6.18.17-1.x86.gpkg.tar 83425280 BLAKE2B 
94c7270b2dad701ccd094b6c06a25c3787289650b6d36896f0679a0e7719a7407a6160a3da91b58eb6b389f212dfa8695dfd18e4a3b82d8c208b965139a0699f
 SHA512 
46e235ca320c35c7f1b938581e9d55d8af0e66802883b159d444742e95b0e3f679002ae97c7dfa3c792340ca40f6ee1ad2db25e99611cc4c51cdf818a57d246d
+DIST gentoo-kernel-6.18.18-1.amd64.gpkg.tar 476774400 BLAKE2B 
eb8b8543f954cb6a8b41a29fbb12b3422e7db4d494d62cd73035a31fdf4f26f8ff6d2bbb6616aa66e62306cdf402c562f8ab5cf9e717b94fd173e2c13a60add4
 SHA512 
f1cce92379e9e0fc296e863ac5ab4e91f0668337ff12d84ba9841d28ab56efe5ee831af83e9b8a9e5d7eef1c7cac52e39a97909518655bdf8caaae88880ef415
+DIST gentoo-kernel-6.18.18-1.arm64.gpkg.tar 449495040 BLAKE2B 
8de3773beebe8b26fb677b1c3dade728674a660a517205415c54a99cb2ce7c221e19378fa18ba206ac1fcf683ee98da5dbec57151a40f0a22dff19b134fe69d4
 SHA512 
ef3be4524d60d2e81e0d0adee7a7426f37916808a202cf81f8a2338131635ed5321ec0d206af059f136e939cf3985d7867f978859361f5356a98b8aa8a78bbb9
+DIST gentoo-kernel-6.18.18-1.ppc64le.gpkg.tar 77178880 BLAKE2B 
b3d7336d65870f7352293676bf30694165d65472fa6c5b1aa341b5ae203137de55a57bab84c412ac3ec2d8d02f73b94e0d6221bffcb18f747f76957dc017aa3e
 SHA512 
7eea03ca5d1c5bd516d988e6459838be06227f0c7e02e253177cc4c919f8d3c5ad62dfa9f7b7401980819658f905156a2bfc83dfc37a9f93c3d55b8acd9bda3a
+DIST gentoo-kernel-6.18.18-1.x86.gpkg.tar 83445760 BLAKE2B 
11b8b8c9d717bb12a79aa3f403384befa6d863428d90e534800ccd4e018da8e4f9b7d2868b5109c24b6d878bab84af151ce4104a2695a12f97d2b58c2300a8dd
 SHA512 
b5192733347533d5efc3cbab9bd000c5381d3073c4d3b77696c471b4df184cd6b50ccd30e9de1f5dcf0f78e4e89dde73533b9f621bfdef03a2826bfeb457054f
 DIST gentoo-kernel-6.19.3-1.amd64.gpkg.tar 359936000 BLAKE2B 
d6883e58f29545d4cf13026b56446b52027739ab0fd0f939db9a3138682818b51c60aecb5d837582bb7f70e7d1849126e543c3435f1c80cb37a8d2d3b88c26a8
 SHA512 
e8e16cd0ca461d98cfce1f6a16b96587102ddb165f79f36e32330827aef33302d79c48aa617929610cc9f35bfa8c0524f12881faaf9ae654c8dc9ec74210d2b9
 DIST gentoo-kernel-6.19.3-1.arm64.gpkg.tar 317450240 BLAKE2B 
a3fa08792d5df3877f8ab340c1f83e45218e01557d7eb5c92db2aa31682345da58021d2e070ee0535dffa2833051e69bd46013424a17345919f72c674457b00e
 SHA512 
5833c6845c5fe8d176942a2a8fd63ff2f690fba1367e2dbbca495be405e8296436557176f9cd451c8ab6215d5cbaaacaa0f9c83f83b430e95a34b3a5683fb72a
 DIST gentoo-kernel-6.19.3-1.ppc64le.gpkg.tar 77864960 BLAKE2B 
24581e33776fab36735d3a9e93eef6d360d8e21c651bd47e7e3695e53feb586d60020600479196d59648a69a2d84114f956f1fc70c54a372f0eadd51af9c058c
 SHA512 
0dfc4e001d1f8491335397c034aac767810ea2378842b0ede079fc1fea0bf01e9663c599eb5ecb54aafb8cdd5d87cf4dd4fb58b00d3bdc5d0e2ff7f64515ad78
@@ -139,6 +143,7 @@ DIST patch-6.18.13.xz 687736 BLAKE2B 
497c7d55a5be3e545e20e16fff09b3d86e1a8716ba2
 DIST patch-6.18.15.xz 900788 BLAKE2B 
1e392e3a7731e795bf69e95da4fd8a89960fcda8e978d12506197373bb2435bb3e7797c8d76c35a0c4145f539dde7b03c1b0e6d264ef28bd7047235ae2bdb867
 SHA512 
e70df2b6f8bee4ad98a558e1cc97c713c4cb08b80cc6cb21bb36a4be02e995007d1c6215f485b9d679fc66e2a7e30c94e3e98d12b21ede1e96761fbd7509a7a2
 DIST patch-6.18.16.xz 1082692 BLAKE2B 
04688f56e63f0ee7291ca57011d74cc0b52cd199a57e7bb7997dbacdc7ee6243933da05fd36ccb4d6e61af90e71e6a119e7fadf19935e78358a375c0bcba19fa
 SHA512 
bf7844571f282c161f1c064bfe9f258d64ef3c026a36cc4406b18323ad919640343de6d3fd35f1a5a67250289112c01bc192c84434e46a62902326dc3b2af175
 DIST patch-6.18.17.xz 1180276 BLAKE2B 
2dca080d55ccbf2dd7e5f53fd8f708497ff11ac5d87c82856f2b56a9b6129f6f9032d1d8864da8f01e0d320b3c746dbdb2227f63791621db5db1725d815d4784
 SHA512 
9fc2ebdc6dc66ccad21f0bd84edcf682d5e57d2a35b5b3987382adecd85c326fc1f54259f8fa2b2cad0849d99d211470867bc6c80c6f566648fd01b6bae5d115
+DIST patch-6.18.18.xz 1190664 BLAKE2B 
528b75f7963d3e1dd2e24cd282510388c528cd93a43982a135cb5ca85583f3d36c01bf67fe854354b0c36e02f9fa2edbf2dc597e4044d2d43dd49efb36949d89
 SHA512 
b242e9ea9c744a61529abb2447d3eb8de31167272b669e132666447a619b24730c4a9fcdb6d7a4132b5aa83cc9ee47f85d7d4d72e25aef383f8929cc7107acd6
 DIST patch-6.19.3.xz 29440 BLAKE2B 
b3a81dfb06c63bf4837863f8a609ca8d3a34f6383359afaf1753dea31e2bbf9e24e8892eb5a108734cb22c445ae7f743c436d08cf7ee7c9b3d7bd75a372737a7
 SHA512 
42cf563be07254942e3873a91241f423753d4a4dc70e18bc8ac210519c0642aef45ea91fdd0e359b7e428a87c5e091e8be3e1199ebeaf679bfc7a09af5e1206e
 DIST patch-6.19.5.xz 296752 BLAKE2B 
93eefaee659ef6b2249be385457f8a2f2f1ee9a5a702a6160b0d598d090a68d015d61f2a080c51bd606ad0f0f37e3f82e94aa66f1eec16ab4036cbcbfbad839f
 SHA512 
fb330f6b232285825a3b07660ac0ba483f41affec973ea026b17f5c25c307c0cc93fdd5d63a30e24556e28f0fbc38f2adb8757afdb2f0fd2b94cf83088e4cbb1
 DIST patch-6.19.6.xz 524676 BLAKE2B 
3ed45ce84787e1c03c9c5503acc32a5239303a2f402481a89eb365b598cd1089d4efed20c787ef0d6a0f6c4fe32e78542cfa3c76ac48a9d81b4fa7729678adbc
 SHA512 
bcc0f5c7239f973b9c41a4ea99bd10a3df70f34c78f3f22b60098f41cca16c872563b2764e239fa49ba7a9a67c4f2c52f37684239ed93d22f8d08d3affb3daea

diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.18.ebuild 
b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.18.ebuild
new file mode 100644
index 000000000000..809e377c4160
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.18.18.ebuild
@@ -0,0 +1,237 @@
+# 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=20260313
+
+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://dev.gentoo.org/~mgorny/dist/linux/${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://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"
+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
+}

Reply via email to