commit:     54f8bff511add35c46b5262d45fcacbb7dfe1162
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 21 14:37:22 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 19:53:37 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54f8bff5

sys-kernel/vanilla-kernel: Bump to 6.1.129

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.1.129.ebuild   | 132 +++++++++++++++++++++
 2 files changed, 134 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index bf15962c23ce..de1a94e38625 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -31,6 +31,8 @@ DIST linux-6.1.127.tar.sign 991 BLAKE2B 
1cc22b5e6ba820e761711a18d860bd661959efd0
 DIST linux-6.1.127.tar.xz 135248052 BLAKE2B 
4a7a1d814eddcedcaeee3ab29483f49e197bdc10ca65bff00e559326494aee0e2cb48ef22bd9597aa787779e9f6e04f77968d902410db9b475e638b140663d68
 SHA512 
dda3b91eeaaebe54f46ad0e694a26956adf736b1039f2e65a6d367689f330aaf9fc2ffee36f7b25b92bb3d4708ddaffed45f191a1e469cf7cb69afbeb29c8763
 DIST linux-6.1.128.tar.sign 991 BLAKE2B 
763389c7ffc179086a53258a4e44801880a3c981fcb8815255171072b6ec26170f465b52c6743e855adb984b6340144b1c1582c6b8c01dceda19e8bc0f089e5e
 SHA512 
96686347494c3338a789b0247d17a2485f65d90ef0a0e02306f0562b04c869ca1e39551da28e0c91dfd5cd67fbba0869e8e23c50683b1d2dd25a70111ae9928e
 DIST linux-6.1.128.tar.xz 135268660 BLAKE2B 
3eec2717e5dd1cea12fc9f0747ecff1b5681bc979ea618b6ec0c4b40caa0a572a17f48e1b44e0aff352e941c35c00189793da2d868e1ef326651a47efd3de714
 SHA512 
8ab950f34bfba3fd8c8190e09f10535ef4cf5028e34a5c9401dbf24af9b5cf27b9093792e12433a7e0918651023dc96ea17046186f5efc8fb34c0bf0c385f5b1
+DIST linux-6.1.129.tar.sign 991 BLAKE2B 
0bb30f02ab11b585b2c4501e904ab6a198c6b2facf574d1ae3b0f028b449468b61f16dc884b305bcb85114017dfec92e7d1705b9cde5ac5bca10b79a485ff915
 SHA512 
4f40ecd3ee1d1adbc1a45186d78629fb3c70234a8554d7e231480dc9b8e30c2ac523ea12197180dd424886a5331176fb8bd305e7fdd136f0f56331edf024cf97
+DIST linux-6.1.129.tar.xz 135266412 BLAKE2B 
9e865a581cad529fc7109cb3e33f3cfaa428b2b6dd236789488e834b080ae2c2a155aa326663fdac11f374f61a223a1e216c6f9d496aee5e903f25df4961d01a
 SHA512 
dbeace0a2a3601219ec927df31158f4f83a8c4830ec41a59b5c60cbfe2b5363f02586257ba47abcf09c26f0f8fa5a6a77db97f9aca2337841ab80aeb0637aaf1
 DIST linux-6.12.13.tar.sign 991 BLAKE2B 
3e960ae0faafdcdb99ac6ff117976794902c2c43f1a67b35c05f6f40ce78c5d6e9e799d3515d6a8e6fd28e10163e0d23c932763cba9650dbab34cf106e83380b
 SHA512 
754aba9a0895db6b9fe7878ba95ef6ca7400143e1732574247069ada5682b89f6130f64dcef5e16454de260a53287724223617722f452aabcbe3bd724272c765
 DIST linux-6.12.13.tar.xz 147993220 BLAKE2B 
6c1f22d80bd5226a08c5ef80e9ab2ba553d00b49b4795b8ccb227381a7275ec89534267354318fa9b938fe99c4d91f0bf6b1d55263ea57eccc3aea1a9ce1d611
 SHA512 
3c9a8c8716f73a732f50b380c58dd08913905120aaf5f12312eb790d9c2f1f3ca08c148e2eb02a2ceb401ada0d85b328909cbf45961c6b2cb5581d365a24f00b
 DIST linux-6.12.15.tar.sign 991 BLAKE2B 
e935fd1a837b076be0e371ae084585c435681c9ee54cf1ccc38accb41010c164c016ae982fed5901341fde7215bbb401c8bf79011656d6b6505c56e6eb75e6fe
 SHA512 
117eefc20c33d7006507a237de16f88378698f081a89dd6226c314101d510bb7a75015665aabd5b3b5361aaaa8841f761dc98d08fb828cfb0276585bd1570254

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.129.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.129.ebuild
new file mode 100644
index 000000000000..f922ce9dc716
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.129.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[@]}"
+}

Reply via email to