commit: 33b1401bc4f12a418f5263b38284e3e9cb47c036
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu May 22 13:54:15 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu May 22 18:50:44 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33b1401b
sys-kernel/vanilla-kernel: Bump to 6.1.140
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.140.ebuild | 132 +++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 3539a771a789..072928922ddf 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-6.1.138.tar.sign 991 BLAKE2B
bb391936131a7e8e0112a28790ecd79ab4c55d6e
DIST linux-6.1.138.tar.xz 135294080 BLAKE2B
94ff5030942544da6c02be2e52b2fe9ba301ffddf30fbd4b26786cbf0a23195bcd5b2141ba5d8bda12fdd38d3eea56c5a92cac14a07e775e46bc91cd1581fc31
SHA512
b7193077063d5a30ed1cd7f7e100e604ceff3ce17d22d050f39ccd9822b5dc397cac7efd74de33ee0ba508e4e76c339a9970cc196ae81c6715d1b4beae5857f1
DIST linux-6.1.139.tar.sign 991 BLAKE2B
139b24555799e0cee6fd2b2313080cb3c13157c10482445164dfc08787227bd55f0b9a7a0c23e705d5fbdac9b633f91a89755a3c42f6c7bbb2ee2c91c8781ec7
SHA512
c3b791437849b9dcd6172ea5244423b1176a940075df1bb40e93b125b8976956d715ca4cbbc4d23ec87130988c2022d8fe10d89e61ecb742c7133c8d1713574a
DIST linux-6.1.139.tar.xz 135310336 BLAKE2B
cf31830fbcc8008ec526f3306e83b6a19919948f0d5f507a0d43c44c7b1719c84d207ed95aa9a636fd3920f97c8b0d4d8ecc797418967adfae49d838bb1bf814
SHA512
2e451972692cec8150a637f774e278225e0adb941a471f016f1374097dc5a57ccec3012eda4e68cf887a362f988fafc029de7554cb7673f8e46d56a86ed9a576
+DIST linux-6.1.140.tar.sign 991 BLAKE2B
84f9b213b534ab227a1556aea4168cd588826fc1d0f66a63f4ca5125c2b4f7799dc76af7708d98e60f2083ea14cfcd957cf4313e9826a7424a444d5b683dd5c1
SHA512
556bb534779ce093853a2fe37ae0e720412e24531c98e64c28f2993af74af304a43aca81e8d8b1d995f08d080ede60e1fa980382bd32d38e61fc852d422485ec
+DIST linux-6.1.140.tar.xz 135307380 BLAKE2B
4180494f5f36c9dba6e33df7fbd9e3cd8f5ec824a57f483b1ce1ebd268ae2f5498b9338bc9e68f6a346186f3eccc3a34ecc2895c83a9874744656d61b616acbf
SHA512
5652224866231f34b2bacdfd5962ed1eaa2aac2be4983474b99ecd81b7f3f7a1543b4e309666244599fd0ffe1a229d0cca1c124b3cc3f0c7212d8a483f1cdbb8
DIST linux-6.12.28.tar.sign 991 BLAKE2B
4e04884ce6e9421615036400053ba98686f82cddff5024d84078343beb67e9f2ce7ef178e16f4b4269cf5c677e01fbe34ad5d8c2ab22c5946451301b7875de4f
SHA512
7055ab8871f085274586527f251f7eca3cdf4a0935a27e3b225b6715789fef2ed273e5782d7560809c12cf9ccee027ab3ddd2cde7f50f467b6f4ac34767930dc
DIST linux-6.12.28.tar.xz 148120216 BLAKE2B
764180a97e8401793564044c240777b7caa5f24e867a5a39718c45788f4d743f23512d25b462b31caf20dff63af37f2d873741c6c475be8a73a64556f5cb4d6f
SHA512
7909cae6adfdd5810c7d35b583781bf920601a8d779882abcfeb0e2b9880d8062c30b53f9bcdf3d81c92b7836664ce5eaa870746af676f3466e06c0d4151d703
DIST linux-6.12.29.tar.sign 991 BLAKE2B
7798ab8893087aa3e9d518563f12ac9bcefbbe8df86eb7de98ca78e76f121b6c93a3299b81da9426d14dc8139f7289dd931dd30841ac75756d976d28b8502b99
SHA512
adc89789dc79cb72877daf606ce967107c8d636ba9b6a720690019ff7c1cf190fa0a1fa378c46caeef8d5d4bcfcb53e09c87e0d5530da4271208611f3e09c7a5
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.140.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.140.ebuild
new file mode 100644
index 000000000000..326396ce7852
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.140.ebuild
@@ -0,0 +1,132 @@
+# Copyright 2020-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_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.1.102-gentoo
+GENTOO_CONFIG_VER=g16
+
+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/${MY_P}.tar.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/${MY_P}.tar.sign
+ )
+ 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}
+ )
+ 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}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+ debug? ( dev-util/pahole )
+ verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+ if use verify-sig; then
+ verify-sig_uncompress_verify_unpack \
+ "${DISTDIR}"/linux-${PV}.tar.{xz,sign}
+ unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ default
+
+ local biendian=false
+
+ # prepare the default config
+ case ${ARCH} in
+ arm | hppa)
+ > .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}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+ ;;
+ ppc64)
+ cp
"${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+ biendian=true
+ ;;
+ 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
+ )
+ 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
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
