commit: bca8c77a6c2dbc21bf521c4be295704e4968e52c
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 19 18:57:26 2025 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Jan 19 20:42:11 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bca8c77a
sys-kernel/vanilla-kernel: Bump to 6.1.126
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.1.126.ebuild | 132 +++++++++++++++++++++
2 files changed, 134 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index bd9405ca45f4..97a308a23171 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-6.1.124.tar.sign 991 BLAKE2B
7971f9507ecef5558140dae20d7dd94940a5d53c
DIST linux-6.1.124.tar.xz 135262588 BLAKE2B
6e261cbbe8140bd80237675c8680d20dc155afcd9645191e07b432c10d2ef9e04177f3071ea0301ad2ae28db50cff625cc2c2bd57d31e77ebc3674399adc8a09
SHA512
0adeebd2f6d90aee2e04783d8b7c674a755b0eec4a762a3722399f23066f53818315657b531a316bef8f1f4f60e1a1aff1fb6d7464a3bbd9ceed07a64095aea6
DIST linux-6.1.125.tar.sign 991 BLAKE2B
2fea5a2d05b049e07bd96cebf4865edc816f9f7bdceab2f7578d6873abc3f6cd27c43cf435bced2c3cb5ef44ccd354899dd184f404eea2a1bd4e66e858f12b4f
SHA512
105570d87e41a54a26dd18b19d5375eb570cc5ea8341e04e88e7f8ef1b52636677de6f006b8be55282750707b60dba30cf66cb235762cf0200c48ee1cad461c8
DIST linux-6.1.125.tar.xz 135233848 BLAKE2B
4672c10bc13474e3926ee7164e65bd2fd1fbfa3fd9fb05ed8f16cc3d9329f75731ddeeb7fadd087cba1e3009e141380d47954bf72cbe52052d3d483ad82f2443
SHA512
a3704caa861698bca1dc70c77cdb2ae87b00a68aee396ff03b5de6425f50557be1ae5fa0feb1619f2754c7cc25a19dc45778a4ff8c01be01564e566eaf38fd0a
+DIST linux-6.1.126.tar.sign 991 BLAKE2B
f10002d40b71ce98dc9f29d6f65ce43e81026f505e34b71f34f261f9c7089952c1a86e0821d8c405f7042b77b35c3e6a59fbed441b037df500869678159fb4a9
SHA512
c2c0be96a4b568e8e62f063d7e10f2069e1134aa068d74bfa49074c10def38c33228bcb1ac15a819451ad8009ac768a73caba68a43599104f78416a4d71b7aa8
+DIST linux-6.1.126.tar.xz 135237884 BLAKE2B
3460821f9d8798ad578730683b53cdb6db7f62bfb607ff4e53ef01a94ea6ce2b5bbe50e6a6bbb81c42230ed8bdf066a203ff6b1a2be46d85c6925e061bb4cec2
SHA512
690e8320c83c7839f6d4f8fe6ce84cda2ae2b5166d6383a29e7659073348fd87dc5602630ab0e831804ed3f2cdd3c703f75fd46796d57c1ac477cfb4bf1bab50
DIST linux-6.12.10.tar.sign 991 BLAKE2B
80ba784ca679c8c531c932cbf37dffbedfc50b4ce2a860b8f196c0db13213f0d2ee114dd747eb9c4fde868a44c0fdb2c19cfed1914c30bd94dc22f4fac5c6953
SHA512
0e58b435ee000dba1343c20b6d544d7ee19541a2258ae3754b8882bd2a0d2082d41149994b76b717f6b92321a659c9c90ff0f59aff3c17e691858add64555092
DIST linux-6.12.10.tar.xz 148033172 BLAKE2B
3146bbc9075b84db4c6ad3a64cbb91e3c379d0b8e9e90029eaf6a5bd37ea2b8a0a4ac1227e73d0e8acd20cab392841e046e148523bdb206302ea6c37a934b451
SHA512
34252b61399495e71c945b617e05d2c55e44a0d9ac0b118bbfc698da54927550f33d067ca6ee8bb2fbcc773aba767ddfaea4c52c3fa357771c69793b76cd75d1
DIST linux-6.12.7.tar.sign 989 BLAKE2B
f991ff0c9c1c5ecd7a7ab2d1f2179ebcc68253230134adea804aa95206611ea7b2034d3e653ecb257bc800189720e4c59c30fb1f788fa1bc0abb1ef914a45807
SHA512
261ed11790468b753a45b074fb578d2d3b88277df1c508a8e5e0ce3221ca1f8a9549afbec12e90ef96acf788be4ea7aa82e46ebc54225a51d4ca2a3aead5344e
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.126.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.126.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.126.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=g15
+
+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[@]}"
+}
