commit:     764671809659237fe1756049e44631f744229834
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 18 16:28:21 2026 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 19 04:20:46 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76467180

sys-kernel/vanilla-kernel: Bump to 6.18.6

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.18.6.ebuild    | 162 +++++++++++++++++++++
 2 files changed, 164 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 88f5863be90c..d2f8215d052e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,7 @@ DIST linux-6.x-sha256sums-20251207.asc 187298 BLAKE2B 
41904c59d9fd208fa07909eb54
 DIST linux-6.x-sha256sums-20251218.asc 189336 BLAKE2B 
6bec5a80ef0f8c7651241e9c425d86026b7e13f0fa19d613a5b67ec892d63751633f04929825581801466ccdc45c4103e9feefa9fbbd63d489a8c5f675f45934
 SHA512 
7fa17449f7908904e6587e380271e153733f6f96ea66910d798facabb9a3247a1b93947371addc3273e6f4c165e2de02003ee0f688f1f0442ba03e63478dc360
 DIST linux-6.x-sha256sums-20260108.asc 190351 BLAKE2B 
6fe0d7b9d000c124f2ed507f545150649e3865b9f9b8425c2bbae56b0258eeac36c6db2d31e5ba6b0176749525b3e93021739105397c250b1d4348439118092d
 SHA512 
87312585792ff098f2a833f25330f45cc822815ce7b19978292907fc6efd6e2771631ad2a69e9aeff6c2cc5af1fae7f07952f1251dabd65e46d98fa9e24c7188
 DIST linux-6.x-sha256sums-20260112.asc 191711 BLAKE2B 
6dc6928250f41cf4c862f42c6ee566e4cf1814fe990e1b0fb64a69766cfb7521734abef361b83b1009cf96412b5afec4c67355832c7b7433cff967a1cb38eadf
 SHA512 
f4b67d000162abd0ea73e5cfea7cbfaefa0400e67673578904a9002f90548eadd0baadfcc27f6f0d990882cb7430c62113c20f0045461887988acbc0dc1e56f2
+DIST linux-6.x-sha256sums-20260118.asc 193071 BLAKE2B 
7705ec74114923142587c593711533eb2a4c38356fa1a6e47a0a824d8c8f5cdf6e41b4c9e6f48fcd579cc9149597c85be997d5f09532e0f350626542cd1fa66a
 SHA512 
2a22041d1977810b2aa9898369a120b3462ad0c9ec647d1ffffd9f7c85c01ff61b5bf9cf059dc9826499f79121c94ed2bb8a7a8e1a5e5ca2a9186c9a35642b28
 DIST patch-5.10.247.xz 6997100 BLAKE2B 
aead70810bfd903f1ea2be4e24a0eb7d3282032115ba1d61334193d33420e08abf87bd537243199b5d4e8d4d161f972fa487ae607eee7a5d5fd38eb9f08cb704
 SHA512 
dba332c649b8b05956ed98fc13f939e699fd8b7f6acabfddb69a7243c4e449a3be6ef15ebab72dfb5d906342b79753210a33415f6c079d1e804b789ab165aae9
 DIST patch-5.15.197.xz 7360888 BLAKE2B 
9c894232147fa560779a3d018396de0f90980b595514e354108ffa085ed527bc808015fc433f5f11ccdafb724773d86790d8f7ceb2ef44a9e76a52c794687048
 SHA512 
f19c09ed50116607530d7eb5cd7f1e9724aff5ee15fdf26f1f89174bf8e753cee0aa929ff5cbe0f180902b765d47062232bbe1e53d622b996e26cde172b12d94
 DIST patch-6.1.159.xz 6840392 BLAKE2B 
d5f15dc1fe5239b2d047ded7dc179ead7f1914900cf3fddfba28fd257edfe8671769c2a93140d0d5e064f2da80029701e2a9d70240f6665e81d594241b813d66
 SHA512 
feb24d4b49cfccc9f33180d19482a9cd7794f63c53f2bff249ab775bf366c9f2b698ecc1cc9a76a46a9b85c4b2105b96e44a2f847f2b15e146f5124ecf655c9a
@@ -46,5 +47,6 @@ DIST patch-6.12.64.xz 3723996 BLAKE2B 
79527e9990c84105254f3f515906809a3d2fb00944
 DIST patch-6.12.65.xz 3728296 BLAKE2B 
eddc8ef3db5f267d11222eb19b95c6ee46bebd63abc7e107b10894c426ed3303537522738e1cdb14f6feeaa1c513fc415e57e35b247a7e361f6cba42242855fd
 SHA512 
668f8af255a429048875d23c0c859d763ee6998d5205bd4e1614dfa46dfb389c8fe14cb29a22fdb6989f289c477bd1d1afb28be77d4c7ba933f10a6b4332e609
 DIST patch-6.18.4.xz 412512 BLAKE2B 
2a78cd052874eb01d38b8857e7647ea3f5904f8ec030b4c90f6b56262ee1974ee76de4359cc1748b9f0e97c5a330f9ac6dd9e3ad8623b96150b3292cb870e33b
 SHA512 
3321241effb0567caacc08f67a1ea8d59d11aac69e6c001b6fbf566f894d70416e91e9ec605ae27909e2e5feac25d9a93bed7db1ede06700afc810cd8e34030d
 DIST patch-6.18.5.xz 414548 BLAKE2B 
50fe5af5616fb080d90111c9b10d7f24ffa40ea6bcd7a645250622ff4adf7923f09bd1a93c82947c6e56a77ea457eb5df14aa215f6c3cae036cc1f11cc20f3d0
 SHA512 
2c07af94135abbb1fc118be061c7b39e3b692783e67231954eabe1ccac8948a126084e651d5648aebd6d58667ac82ba41264057df1cc81fcaa161df5eee56395
+DIST patch-6.18.6.xz 465484 BLAKE2B 
b7df26c8e524eacf89dfd34c92d572a0b36e0f6c6bbe3183d3cb909ef156487557337bd1e3780ce383966d06a9d2f640cf6ee4fc64750ff9c592a46fea010993
 SHA512 
ffc4711d98b639f1b43fbaeebb8f5c088218b263b178b03494522d3ef21898595fb961bb4202284d40aa42b3a8a38e365e3b610dd9ce86d19e19d9068e54609c
 DIST patch-6.6.119.xz 5306132 BLAKE2B 
36172254639820d8853be83c2f98cf1e9923087b07bc939d0ff97dd8f3fa1af3ea1719f76aff619f6e7d8e493d7d2f059beac5127a644bc9e533a95b35c14759
 SHA512 
a4e8267769e719a30ca8d07a5c6f87b4856d55711eebde74170e8e1de4ef74be3ad69cbcb7d26bc7ae2e7a133755b7c2d1faede7e8389c29265358868238a29a
 DIST patch-6.6.120.xz 5455104 BLAKE2B 
0c6395ff0a859101789bd2d02d9ea5e29611c38bec75f575fc656248980b622f365fe1b48e90b2d3bbea27c584bcfc4dff4eba7a6a65666f600e324511790602
 SHA512 
ce62624edc873023769d23bf02b015aee84d9eb38830956b3738bbabeff3c741f2d046c2a5254674e57e10614a4209ba4f3586a995180951923798634bacb2b0

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.6.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.6.ebuild
new file mode 100644
index 000000000000..0d9f5415e93a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.6.ebuild
@@ -0,0 +1,162 @@
+# 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-build toolchain-funcs verify-sig
+
+BASE_P=linux-${PV%.*}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.18.3-gentoo
+GENTOO_CONFIG_VER=g18
+SHA256SUM_DATE=20260118
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+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-${PV}.xz
+       
https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+               -> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+       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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       riscv? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-riscv64-fedora.config
+                       -> kernel-riscv64-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       sparc? ( savedconfig )
+"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+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-${PV}.xz"
+               cd "${WORKDIR}" || die
+       fi
+
+       default
+}
+
+src_prepare() {
+       eapply "${WORKDIR}/patch-${PV}"
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               arm | hppa | loong | sparc)
+                       > .config || die
+               ;;
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${BASE_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+                       ;;
+               ppc64)
+                       cp 
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               riscv)
+                       cp 
"${DISTDIR}/kernel-riscv64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+               "${dist_conf_path}"/6.12+.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       use secureboot && merge_configs+=(
+               "${dist_conf_path}/secureboot.config"
+               "${dist_conf_path}/zboot.config"
+       )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to