repo/gentoo:master commit in: sys-kernel/gentoo-kernel/
MichaŠGórny <[email protected]> Mon, 03 Aug 2026 14:32:15 +0000 (UTC)
| Newsgroups | gmane.linux.gentoo.cvs |
|---|---|
| Message-ID | <1785767522.2be5c514839b4ffd9a45835cdac7f65d33c396a4.mgorny@gentoo> |
commit: 2be5c514839b4ffd9a45835cdac7f65d33c396a4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 3 10:12:57 2026 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Aug 3 14:32:02 2026 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2be5c514
sys-kernel/gentoo-kernel: Bump to 6.18.42
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/gentoo-kernel/Manifest | 3 +
.../gentoo-kernel/gentoo-kernel-6.18.42.ebuild | 191 +++++++++++++++++++++
2 files changed, 194 insertions(+)
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 855299af421b..a324264c87bf 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -10,6 +10,7 @@ DIST linux-6.12.tar.xz 147906904 BLAKE2B b2ec2fc69218cacabbbe49f78384a5d259ca581
DIST linux-6.18.tar.xz 154309096 BLAKE2B b94b7b9bf18aca0c3e50baf79b009a1448fc6cd9c3ee019f641cc247dcf53a4abef4274ee0608ad8cd4943af69854363a95d26e117ff23620bb07dccb158859f SHA512 88599ffdec96d150c1feb9b261ba93bb0301a9d0e1ad6bef7aeab1f5372cbfc57d8b43c7e902bd8f76921d1dbd8189663c142ea869e51d0e2b483b150ee00fe0
DIST linux-6.6.tar.xz 140064536 BLAKE2B 5f02fd8696d42f7ec8c5fbadec8e7270bdcfcb1f9844a6c4db3e1fd461c93ce1ccda650ca72dceb4890ebcbbf768ba8fba0bce91efc49fbd2c307b04e95665f2 SHA512 458b2c34d46206f9b4ccbac54cc57aeca1eaecaf831bc441e59701bac6eadffc17f6ce24af6eadd0454964e843186539ac0d63295ad2cc32d112b60360c39a35
DIST linux-6.x-sha256sums-20260730.asc 237001 BLAKE2B 947bf4d979b19acdef3ce14d87a0c4d0902d44bd4a046e921e84395d82096f022deda19cea1004672b290872e83ef24a96846c20129513384192534d7cbca0ad SHA512 ed329d60aa847bf705ff017bb75b3667dadf219d6977d92869043bd740d6a9be03b3a36d61641d32c2e74ace99d04ee3e2c66e550de2449223bdf3f3fb35f5f8
+DIST linux-6.x-sha256sums-20260803.asc 238028 BLAKE2B 3681da2ed7cf30afb939a4abd66400d006a531c10b44c5cf1fd133cd050d27268d66be17d98620b585f3c71b05e73c35fa3a2a2fe6a58e0f9b2add6e0343e271 SHA512 042d9fef481598bafba5b881eac685f799b85313435197d0027b448dc3beaa5b550ba508507e02f085244e72caeb1f2dc63243af63a70e7457988134f69a0608
DIST linux-7.1.tar.xz 158304768 BLAKE2B 5199b2057fd1b89f0275bdaff9d81035cf5e1e8e64318a4a67467399245628a0f8c5e82f9d80dfc54b094349a8cfcdc892b7a4ad4bdf5dd1daa268ff30c1cf38 SHA512 d4d9c45261813559341c67ea53d4a47f5a04d1ad15e3c2b8222a09b5483380d2bfd31b8c675e144db2eb91f560d6cb28f66187a5ea4f24f6dfb82a4ad48064cc
DIST linux-7.x-sha256sums-20260724.asc 7879 BLAKE2B 1e2043f96ea2fbe6e4f89049fc4f835f65422b698cd9fe7f0c5c9eca05bef143700914f919876bfe22a25ce7f2243df93217070e183161c8513dbabb74735408 SHA512 3eb0fbda0affef13e5f9ecbf34e9032ea0fa4bd4d8153f023738bcf18963630990b055b0264dd63ff8a72da65b1ce786c4a02a6fd639965cfc5e54c0813c923b
DIST linux-7.x-sha256sums-20260803.asc 8212 BLAKE2B 53f9b7e979042e10c05ce4411386a6bcbfd02d412d40c2f49eb295b8224741ff1202fc16c99041c101949260a0d6405876aa41d4db019816b526d57961c0727c SHA512 f5b1d7c6078bac74237eb330b8fc0ee51a29b36059843107fdcab3211aae990c30a31e12122268d0f64a4c0f8df1c865cc6345a9f6e32453147c52272f748e49
@@ -17,12 +18,14 @@ DIST linux-b19b382f183d421a407f5d708dde1eff5009274d.tar.bz2 1401905 BLAKE2B fdb8
DIST linux-gentoo-patches-6.1.178.tar.xz 14432 BLAKE2B fc278094f85f58b7aba5c3334503114d28aead086a1e62499111283f0410c02bc9db7f5187975fcf2a793a5ef32e323b9907bbd9e0fb4c0834dc1a823f36af52 SHA512 ae0606ab52f8d66f49cac198aada1cbcced465d8ae43e09ef02cee149125570e09eadfacc07f9ec0ad3b20b365df7b9718a478252771f7c6e09fecda6f701096
DIST linux-gentoo-patches-6.12.97.tar.xz 17192 BLAKE2B e0f09dd8ef2e6ebce9adcc2c050cb7e2c7ae08188e99635d3b541c6deca5bea792f4ec2c8d0c0dbc648b0c1f227b54a95d8d807a43859b3bf1b5f57767af2113 SHA512 af6b182d1e7661c35c215f4da63c8ab53b1ffffa7818a266b4c5639ed8d03428d050f1045d02e885c1b9bdc9fb2464c3f384dcd55d7536eddf2b90ffe1f8c530
DIST linux-gentoo-patches-6.18.40.tar.xz 11772 BLAKE2B fd383c172c74a00978b6b78fcff6ed24fd2323f1d2a15a67428861f03683db38a6b2e8d225e138629bcfbeb39b693ed16c24349c8de5ea450e93604e3da745e1 SHA512 e8ec7b1dcbe358be29b01ad0a9740535274f19c9d2694d30eb2c428aaad5eadad6cef3a71f42afcee65fb85fbfc2d59731f0f3ace6800bb640436115fe0f1075
+DIST linux-gentoo-patches-6.18.42.tar.xz 10856 BLAKE2B 8d9de53163c26980f2097eac090f8add2f0f22707824c25493d24d53cc82ef5bc24dcbc7e1e324010315bd3cd05cf2abdd36c536f1457b311cc5208a1a49575d SHA512 01f3020aa34f0ee29c37473344f6dfe0180a12d20834f9c935575b98092b1c6ddd6c563aaef9e4ce6f14116e5d7386d2203f120d1c680ff617f581c867d4544c
DIST linux-gentoo-patches-6.6.145.tar.xz 39848 BLAKE2B 46a5473d9d056b691af2bcda322630f455de056e079ca7be74bfdfe9d7e6fde3685b96dba10e6283724eb566f8e8aee731b5e06a09c7575f57dabf60f4bc8ff1 SHA512 4dd9baa27f6647f8e43f94992dbb5c7c4d1bf287f4f328dc637d0af45042241fc1396c7311e1f118d4488864229bf2554fd9530033583196f1550b04aa0cd6be
DIST linux-gentoo-patches-7.1.5.tar.xz 10484 BLAKE2B 9b65135d72792375660312e27170cf92858c1a5063c38faed02b378dae399d8f119ca3ff1400175c7354d3e14d1b179a96b4087141d6da649b7ce90b3be1af02 SHA512 c496dd761ee462fbad26186c21f5809e6f7c915de17c4dfc9d1b7ff612f9edc45891b7e7b0381d4faaa50091c4699989a89e1162f897bd6f352170157718f94a
DIST linux-gentoo-patches-7.1.6.tar.xz 9584 BLAKE2B c87be59dce825d5bd5fccb260eb17726e955579e9c8d66609fd2cc2163a5f6ef76cefad2242f5cb278e2657890cc2efc003700cc8fb7ce3bf12fb595641286d5 SHA512 1519faf4e7d7bb9e65ed1f923e59fc20129fabdbc5e95d28273a91ff241d494d5a0cd61ead5a5a174a5188c40b1db7d866f072724f4bd6ac94baf52a3ac325fc
DIST patch-6.1.180.xz 7846572 BLAKE2B 8cf59bea6c376c6e544b8afe42fcdb19bd00da7b5b984d0d0ffbcf6f44c2d6d320eac5a9ffb3cbdedc5ab6ba840c7e779b1f8676ed292737eb6543793b049b10 SHA512 04ac7f1330e4d9dcf3f8f2bb3b8678ee345dfbfa47e66ac4ba842ff80cb834b6bb49dc513a88726855f4f35eb9150d0c899a0b2e7df5503183efa7718a2b2acd
DIST patch-6.12.100.xz 5245604 BLAKE2B c0fb332fb1bb5ed18cd6dfebe40569b975073ed2b2c7101c04bb8c6281a1a0dea999bc6985adc50860233e4c2ca57c394090625bb83a288122a0c3fdc8142ba0 SHA512 09a74ff66e3bdaa9684ef98c0a4e30979bebe319f119b14b87a62bae2f52d995abba4194ce11ea5e02928d140707fdd7e8e2336a376a0507a5aea1c91a55dba4
DIST patch-6.18.41.xz 2796664 BLAKE2B 354c5ad7f53b85d1d3724b7d1571c2f7c202d83dd0ec4f005e8741b89e8e41fb8e93ecee4bcb1473588a55f610f131c557124c210d47970f3239fa24f9244eaa SHA512 10f64066a9c5cf297981e2df6eef31593b5c33f55546f3fd18733c55ac1607ad8e4229f538f3027fce27dda178bebd05bb99fd1b3d8a06e3e8f5b8f481c7087e
+DIST patch-6.18.42.xz 2994988 BLAKE2B b77b0cd3520e35d85918b234ae26122354dd33d397aa055ad259e85855c07fb8da2969e99ed5004434e1a1cce243aa6692422423dca70605049dda6ae3434ca1 SHA512 0705532d59b0e52ec0f26440af45e4535424a7328acc9384ba58fe2cb333351cb87b21364efd42dde21c9a8759057eb1ce8d97a995324dc8d2d254069281f4c0
DIST patch-6.6.147.xz 6568988 BLAKE2B 764927281faa4332ff5a90877d613563cf478a82d6af871ebeb131fab3425eacfb756c9078e8ce4e4833d8e3588468bfcd24a8187ceb844251f411edd2dce174 SHA512 fce2fea6b3ae26ee6e66ef5167a4a6d3a6b3832283fca7d62e0d20af2b6b2dc43732b955143b8f1d4b8153aa27363e9cfab3caed647d6dcf4ac4f2b6deee80e3
DIST patch-7.1.5.xz 882648 BLAKE2B 484bfd4ae3ee5eb7da2cc8a58138c1c0bba966fe99e8f47603ca3e5f8de50c470301d19ac69322e73d52637e00e73c50c863d77a442fbc2008a8221ac76e3cbf SHA512 fc3cc487e2a633b9c2f0122a2dcdc3e515b4ad433c72372d7cf489b2c60ac186bc6b5ba9a1a7ea40683a5387c0300349ca6873d2938dc4ed2292e77f1743e01f
DIST patch-7.1.6.xz 1102916 BLAKE2B 3850fc2be353ba0d5936a755c0ef9bde19067cc5cec57075a5875ac136c8813a79d3ab3213ef314d14a0a312c109b404cc5580b6dae172b846a104fcd083b0a2 SHA512 b0781089712ed4e2569a95bc22d6dccd5eb138b9c2810281b0793525889b671495b0b3e9d46956ffed854f17743258078ad921a62df84c0f316bf5b44f6c1c35
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.18.42.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.18.42.ebuild
new file mode 100644
index 000000000000..f2fef03637fa
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.18.42.ebuild
@@ -0,0 +1,191 @@
+# 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%.*}
+PATCH_PV=${PV%_p*}
+PATCHSET=linux-gentoo-patches-6.18.42
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to git.gentoo.org:fork/fedora/kernel
+CONFIG_VER=6.18.12-gentoo
+GENTOO_CONFIG_P=gentoo-kernel-config-g19
+SHA256SUM_DATE=20260803
+# Debian kconfig commit from:
+# https://salsa.debian.org/kernel-team/linux/-/tree/debian/latest/debian/
+DEBIAN_COMMIT=b19b382f183d421a407f5d708dde1eff5009274d
+
+DESCRIPTION="Linux kernel built 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
+ https://gitweb.gentoo.org/proj/dist-kernel/gentoo-kernel-config.git/snapshot/${GENTOO_CONFIG_P}.tar.bz2
+ https://gitweb.gentoo.org/fork/fedora/kernel.git/snapshot/kernel-${CONFIG_VER}.tar.bz2
+ https://salsa.debian.org/kernel-team/linux/-/archive/${DEBIAN_COMMIT}/linux-${DEBIAN_COMMIT}.tar.bz2
+ 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
+ )
+"
+S=${WORKDIR}/${BASE_P}
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+ hppa? ( savedconfig )
+"
+
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+ usr/src/linux-.*/scripts/gcc-plugins/.*.so
+ usr/src/linux-.*/vmlinux
+ usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+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
+
+ default
+}
+
+src_prepare() {
+ local patch
+ eapply "${WORKDIR}/patch-${PATCH_PV}"
+ eapply "${WORKDIR}/${PATCHSET}"
+
+ default
+
+ # add Gentoo patchset version
+ local extraversion=${PV#${PATCH_PV}}
+ sed -i -e "s:^\(EXTRAVERSION =\).*:\1 ${extraversion/_/-}:" Makefile || die
+
+ local biendian=false
+
+ # prepare the default config
+ case ${ARCH} in
+ hppa | mips)
+ > .config || die
+ ;;
+ alpha)
+ cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+ merge_configs+=(
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config" \
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/alpha/config.alpha-smp"
+ )
+ ;;
+ amd64)
+ cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-x86_64-fedora.config" .config || die
+ ;;
+ arm)
+ cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+ merge_configs+=(
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config" \
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/armhf/config.armmp-lpae"
+ )
+ ;;
+ arm64)
+ cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-aarch64-fedora.config" .config || die
+ biendian=true
+ ;;
+ loong)
+ cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+ merge_configs+=(
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/loong64/config"
+ )
+ ;;
+ m68k)
+ cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+ merge_configs+=(
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/m68k/config"
+ )
+ ;;
+ ppc)
+ cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+ merge_configs+=(
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/powerpc/config.powerpc"
+ )
+ ;;
+ ppc64)
+ cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-ppc64le-fedora.config" .config || die
+ biendian=true
+ ;;
+ riscv)
+ cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-riscv64-fedora.config" .config || die
+ ;;
+ s390)
+ cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-s390x-fedora.config" .config || die
+ ;;
+ sparc)
+ cp "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/config" .config || die
+ merge_configs+=(
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64" \
+ "${WORKDIR}/linux-${DEBIAN_COMMIT}/debian/config/sparc64/config.sparc64-smp"
+ )
+ ;;
+ x86)
+ cp "${WORKDIR}/kernel-${CONFIG_VER}/kernel-i686-fedora.config" .config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ local myversion="-gentoo-dist"
+ use hardened && myversion+="-hardened"
+ echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+ local dist_conf_path="${WORKDIR}/${GENTOO_CONFIG_P}"
+
+ 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[@]}"
+}