commit:     8ac3afafa5525e8bb184d004edd3295b7783052a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jan  2 14:44:27 2026 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan  2 16:32:56 2026 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ac3afaf

sys-kernel/vanilla-kernel: Bump to 6.18.3

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.18.3.ebuild    | 163 +++++++++++++++++++++
 2 files changed, 165 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index c3c7b3ff00fb..2b3fb3098ac0 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -54,6 +54,7 @@ DIST linux-6.x-sha256sums-20251201.asc 185934 BLAKE2B 
9667996fe5102de2d0d2267ab6
 DIST linux-6.x-sha256sums-20251207.asc 187298 BLAKE2B 
41904c59d9fd208fa07909eb545ac5829d510c45ae37bb4180df556fbbbd83c2c2285c74372e7d6b214f6057503becdb4d87e846219e5355703f8c0a23296b8f
 SHA512 
62e3f162563a30ee3b3c636a099eae59cd1e0d73e43532bfbac19b89b899b8f886a05a7e9ae80a9775b8571d31a5be14cb243692df14e3113c90f610d4a47b92
 DIST linux-6.x-sha256sums-20251212.asc 188317 BLAKE2B 
c00f55350950ad2881fae2ae4714d918e02bb642329b79b9d18cd9b08e68fc0a72d9e8171f0732469082e553dd8d2e8e06720bf85b09aa4557cab7835f722e03
 SHA512 
0cc2b8891d88c15f5cbdcc5f2ba8265ef9b887f21e924f7022ef80c69072b8cd4373c84f162556c221360528eb8265833c28aca2fc70a98e03f06a4e201924e1
 DIST linux-6.x-sha256sums-20251218.asc 189336 BLAKE2B 
6bec5a80ef0f8c7651241e9c425d86026b7e13f0fa19d613a5b67ec892d63751633f04929825581801466ccdc45c4103e9feefa9fbbd63d489a8c5f675f45934
 SHA512 
7fa17449f7908904e6587e380271e153733f6f96ea66910d798facabb9a3247a1b93947371addc3273e6f4c165e2de02003ee0f688f1f0442ba03e63478dc360
+DIST linux-6.x-sha256sums-20260102.asc 189673 BLAKE2B 
62134f50dad0f42ab8bbc7a11b874f4742e09b22792f872ce4410f94b41a410ff6728e7fed0bd620a2d465962fdbea22dfc6f57b3e4cb983b6d2d629e1c40f7d
 SHA512 
d4c22ccec72654ebbb59f4b442906081011bcf5648c719fe6196ef4ffb0c2f00be5bb5025eaf358f96b2b00ab76f77f7db22f1df078d5ac03a7ef6b07c2ce43e
 DIST patch-5.10.246.xz 6964592 BLAKE2B 
b893135670cd9068a8af6f05607ef680d38c4bdd121e1bd3289007df7f0cbc22987c810fe697b939885e20346fb759b4c907870000a5c64f8cad23568ed10a55
 SHA512 
52e6f9bf483c3a588f934eeafdb40bcf0d39ad4c32f3e176ff1ed6f8485c1705ff1e5fc268352772e7aba3a93736653211baaa90df64a6c3d7494fa631c1eb5e
 DIST patch-5.10.247.xz 6997100 BLAKE2B 
aead70810bfd903f1ea2be4e24a0eb7d3282032115ba1d61334193d33420e08abf87bd537243199b5d4e8d4d161f972fa487ae607eee7a5d5fd38eb9f08cb704
 SHA512 
dba332c649b8b05956ed98fc13f939e699fd8b7f6acabfddb69a7243c4e449a3be6ef15ebab72dfb5d906342b79753210a33415f6c079d1e804b789ab165aae9
 DIST patch-5.15.196.xz 7179588 BLAKE2B 
0b56f80db1c0aff2dfbda176a42daf6efa603ab1424601f938b4bf1611481df27a8412461fe6f4f273520da08627f51c2097b8a3199ba4e34491c9b7e044ed26
 SHA512 
dd29cc79aa3f9b339d57b1bff19761316b5893be3244e97cde95d80f3c9d608f6a4343a0ab3f25febc658a5962713403bbf7d488c121f68105d3ad2f73427b9c
@@ -73,6 +74,7 @@ DIST patch-6.17.13.xz 993300 BLAKE2B 
368ed14af870d06af317a28b1e2ca5ae32fce924621
 DIST patch-6.17.9.xz 764968 BLAKE2B 
a0ce8311be7c251ad21b7cc11be4f30ec5125e3763f97a750afef855be385a3ceae24df3b65b5dd751729575aa0cd254a95cbae0f2e8cc8f95539dcfa2d9d3a1
 SHA512 
35593bc973cc7f626aa7a41cf8b7dea1b46fe8922bd57194db363d26e8854af514d103e39d02c642c26748bd933d5e402ff89d2a20d2da5f8d901e4713eafc46
 DIST patch-6.18.1.xz 15784 BLAKE2B 
fe7857feeeacdbad91db8330d74a2bfd53d35783e8c37366bf76d2d4c6e7d38a83c3923a950500d5a2f758141a24bd6c248e723130db7c04293d3a07cddef5ce
 SHA512 
09ed1dc6b66ee15921167de612a9e5178d37dfc874731b2893a833acaaddaf929e900ba9366d3aecfd678b67a28d3889f897735c6305c2b4af87a101a84ea775
 DIST patch-6.18.2.xz 203656 BLAKE2B 
58ee88f8a912a4574bacea12016213602790949224f10b75a823ce1b2977640e4d1f96182367f399b66e1a423cb94c1314e9b6ea405ccb4043b7beb28880c174
 SHA512 
243c839c47bcb222d48ebebee3d318d5c17b5ad12d9a1df0aedcda7bb5262c4765b43ac3df82e8c0787a7b8242f51b2dd3227e5e07949eb644255a3b9e90a20d
+DIST patch-6.18.3.xz 323692 BLAKE2B 
853264250d99c1f419efc297a3d014c6342f9b0f4d7e57e5bb87cced644aabcaf8b0055fcd1f9b5e10256edfc0b96b442a53f20f7e09de7ac312d3534c3cdb39
 SHA512 
56defd8afd1e406ee7475e9e5842abf3d1b6fbe27d5bc906d2879872d0f2cf99503a2626d2937f22f01f324f1c9877afe654f252585d5b8fcc372fbde9b7f67c
 DIST patch-6.6.116.xz 5054680 BLAKE2B 
0ff38d6f77204767a2a2f79080405634a53ee304754156fc1c5f0c8aa339b39b2382d3d4e33132a2a5c02d0c2c81ae07e20eb55ef76b62788411321399c49569
 SHA512 
60d1d70b217a4908d3b67b61596013b3ecc06d44ab095ad50accb21a71bb9b3d20128d38cb73790b9999e0e922092c06a414cad0efaab4c1739accc7cf8b5510
 DIST patch-6.6.117.xz 5149968 BLAKE2B 
5557cb9181cb2885ebf7bda52e37c69b91f6be11b8338b8ab5d691d3786a0d1ceac432062a2954256203a63c19277725a915284c520cfd7d1ef72df82ba41ccf
 SHA512 
387d134e42416f90a32b349a5c941ad99d135cd57388fbd90ca0479b0521bb1aff0f3b8f6b8af6f9d73ed0f0f83ded8728300bd99c63473cf62a0f700d03de25
 DIST patch-6.6.118.xz 5155016 BLAKE2B 
3d5ca3e87d1eb8605d3973347e551ba0e3184aaeba6f895872838327cccf7a2046f53f8586db547fc9c2e38586e630db9274a2347d90896f7a15730b247cb3a6
 SHA512 
d692a749b9b7b21a50f6bb404b3da9f77b529e855167f633e4a70e177f358cb1ad072edba6512ed37fd04c0fa986463e5bbb34472555b419ef71fc946a487eff

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.3.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.3.ebuild
new file mode 100644
index 000000000000..b477337d8e87
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.18.3.ebuild
@@ -0,0 +1,163 @@
+# Copyright 2020-2026 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_GENERIC_UKI=1
+KERNEL_IUSE_MODULES_SIGN=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.1-gentoo
+GENTOO_CONFIG_VER=g18
+SHA256SUM_DATE=20260102
+
+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