commit:     ad6ac66d0e06ff52f38ec92b50d888a80ac0a9fc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  2 03:34:36 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Feb  2 13:28:30 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6ac66d

sys-kernel/vanilla-kernel: Bump to 6.1.128

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 4922517f3115..1126e0f60cba 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -21,6 +21,8 @@ DIST linux-5.15.177.tar.sign 993 BLAKE2B 
702bb6419ac879f534a3129cae9509c6a61262a
 DIST linux-5.15.177.tar.xz 126718820 BLAKE2B 
90fa443e71fcc81d14785b749f70b2c5d8530564d5e039cc5a1e53b7a0cfa5a646ab2ea600e479cee7883b4f12d31b0afd4b5bcd4517e16f5ef6d90eb7539885
 SHA512 
4b078c2e63e55cd9af408114ec1ac6acb34df39f4e4cb496de7a32d9dc4bb26db9d9e17e40529e9ccbd3e4f5c645d948bdf35d7d4b800ffcce9eb24f5f83c609
 DIST linux-6.1.127.tar.sign 991 BLAKE2B 
1cc22b5e6ba820e761711a18d860bd661959efd016ffe0d42a5c2f2cc26956e1d9521eef1e175a454b44fc7030ac99142f71f9e17cbb04d8f32df9f01d8da034
 SHA512 
d2f9c15913f10ebf8f081c9565cf295e054b2c689349e510169c2a9e47dbbfbc15703fa4c8f53ff24faad24688583ae0406611af74534c1eeeff2dba5eb5d7f8
 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.12.11.tar.sign 991 BLAKE2B 
f4752562d0d07bc8d92895ac31589b02f28ae314b7ac8e0f2730f649c125c6cc7d5996fb25757edd6f49132a09419e2e28c3785f2cdc7770f9051d103985596c
 SHA512 
16816b31db1c57ec2eed8a5516e4f9ec02c99871dc7dd7f2e0a7d7c936f4a6d390a28f0b2ccb092a600187e480163bd2037c0bcf3c6668e75c1a7cb2d8b61cc2
 DIST linux-6.12.11.tar.xz 147981772 BLAKE2B 
8f31f2aed810d1fe724142011731f361a543da301a1a14c92b852c8cf81f7c4bdce1b74783e0dd965d7bf225dc6006b44eed622bf6dff09312265ce3cae1ea32
 SHA512 
f5c1af5de024da71193fb359125087246d0f98f7d21b53382e7b53a59c6eab201e37b35a8e2d340c2e89775e05dd23de55f731c1c4268a03e365d0c67fdebd2a
 DIST linux-6.12.12.tar.sign 991 BLAKE2B 
0ff54fbb0af0a9a53d013df0623b5b0ed77871bd47c1e18da5c4f22c03dd75bffd572edce2a784455e912ac51bb4394ec843af3b8168e721dcaca26453542944
 SHA512 
1151a76b10c145ee14c9ffcbb10cd9cc53b3c9d5c0ca126c3a963f6c129c626b2e3cc0979a7455f9d90dee09cb0403ab5c24b666942a3b324bc1a2f46a213fe9

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