commit:     b11f50935880a6e411a43681fc298606be084fcd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon May  5 17:04:25 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon May  5 19:33:21 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b11f5093

sys-kernel/vanilla-kernel: Bump to 6.1.137

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index b14dd98d6f56..8010ca80bcf2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-6.1.135.tar.sign 991 BLAKE2B 
e621f70ff5b4c06d31d80b6246fe426585343058
 DIST linux-6.1.135.tar.xz 135288980 BLAKE2B 
e6ca8026cd0c01c55ef325ed7f06c96369f90a4702595f21dad622d324b79c83e1dcd3328e51d99424bc82e72f866ccebee8b33d00a08feb9523243fbed0110a
 SHA512 
3fb40d438daeb67adb4831998d1bc3c8d02c0876637f4039930d1ab4fe7e37993051f36918e10be9182bfd2d1e172b97e15f376efa3d900e99f9ee3bcaf2c793
 DIST linux-6.1.136.tar.sign 991 BLAKE2B 
0e9ff69effc6314670cbd80fee757633cdd28bea72fb4fc5fc7578d0a42d45ab38494b467cc4291bdc07b22e4d5bfa9f982cdc91e124df8d7a05be68d5263bb1
 SHA512 
97e91aacf9aae00ed50b11e2cf20778fd4858d0966dd20bd18ac94254620dcef8147c1a179df27716ef605ed6f509f1d0503c3630882ac74c75b57724147255b
 DIST linux-6.1.136.tar.xz 135283328 BLAKE2B 
4ccb170ded31587bb24b0fbcc501d91023a2cfbfd5b65b0e12caf7ccc09080b31200369c4e696bb55024a0c19c04a6a69a87dc5e59c81c9dad50f9000ed1a134
 SHA512 
d4ff15ea75a3efb392dab86e66059313ce7eee783e38dacbf808ca8e459ff05c6172f53e47d509cf372b676d83b94265119a88a851bde308fb96b71d420dc78f
+DIST linux-6.1.137.tar.sign 991 BLAKE2B 
a839d8c072bbd5a5564661ecd902d518caec6ccb72be85c18b908fef9230c101ebf1b1f44f98043538e58aaf70ea2a54dec15dbad1c3071a4509c362668122af
 SHA512 
b5338ac868bce2201a8d9cbcdb28a2cfbc6c433de4f5c0aca8e91c2f960df6ca3a8cb1bf16c549fe131f488fef069ad1b22370b98978dbda96ccb29cd34bdd8b
+DIST linux-6.1.137.tar.xz 135291668 BLAKE2B 
2ac78f2794bf6bd6962ca5af00898e5e889ef0a16712dce190ca204446d4ae5d4dfb2586d66fb8bac551d951cef24163579ee7dbe6a67bf8337f1c7093d841dd
 SHA512 
cc30cc39dc9de1cfa1005fb7f515ed467cc2c9bcc1506486f4887946eece036f321d053d87bd687024f6b222a61191340fbb14afea68da900f63d93faab8c5c4
 DIST linux-6.12.25.tar.sign 991 BLAKE2B 
e3bc84c6050a323480b8eac343d19b986305ce7c3a89a2101b05cbe75e3cfa52a7aef2a1f8fd80cc54c0406e4070dd8d4b1f04209eb8a63fca1e2ce6374f84da
 SHA512 
1b79197254a61824e803170b9646857aac625a2b039f10ea6ad901032f72f5b52d6b65fc002532e9ac30233f3ab0f60c5d764250da73844d709cbf5c515d0c50
 DIST linux-6.12.25.tar.xz 148119160 BLAKE2B 
f647cc49328383876e04871a05b1b7dba761c8535f6b72851634d08d839954959276b22cb87d8c22d3ba5141ad08c19b68f28f8027d58cd501c962bb43e7e7ad
 SHA512 
00a69a5d4d36cd845dc94b8b184cb0dd92af0fdadb4cacdc7592d54c272ab5dea11df5c0cbc4370bc4a8c63a427d772ea6a413c40f9e77ad97dd33ace8efc08c
 DIST linux-6.12.26.tar.sign 991 BLAKE2B 
89ab2f7797adbbcbc24a008c205fdb1bf72ee8ef593043f4621f527f7642e1cb3187f04a69a001c922c2ae06d60d5263585723100cfa0b3805dae80573f15549
 SHA512 
59c57ba020d16405c0ab9cb6a89fe43cbfd5e11e8dd88c5f642bf4459260382cce94bd70d1b27120b0235e218236ffa232fdd6ea447fa9dfb037438a8bc7cd67

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

Reply via email to