commit:     dcbdb4bb3fdebae3f4bddca764eddb403e5cb977
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 24 10:06:57 2025 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jul 24 14:45:09 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcbdb4bb

sys-kernel/vanilla-kernel: Bump to 6.1.147

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

 sys-kernel/vanilla-kernel/Manifest                 |   1 +
 .../vanilla-kernel/vanilla-kernel-6.1.147.ebuild   | 148 +++++++++++++++++++++
 2 files changed, 149 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 9a00253cf3ee..2ae505674ba5 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -39,6 +39,7 @@ DIST patch-5.15.188.xz 6943596 BLAKE2B 
5314b24c051e36e0dbe0bb73c57e9d846b9df7898
 DIST patch-5.15.189.xz 6955776 BLAKE2B 
bd2bf4ad70014395ffac8874434b2caae7823b1b9999231738552d9f23a53547533c248fdb7fc4b4bdd60dc05e8898a910e3e94e6f5edae7ae96a66937f387a2
 SHA512 
8ace7d82af676b101ed37c382c9833193ab487cbb15b8444b92ccf8239e2c62bfb70ef7342ef6f694d71e8ac72b7db445d544e4ad285d9bd977365350bf155d3
 DIST patch-6.1.145.xz 6289404 BLAKE2B 
c076fe18a597abd32ec98e2cbd64971ce1ee39395a54928f6d358e1fbbfd8a3e7b0679232bb8117b230df2fbfa1c96459c8432fbe84ffcc3d926f64d99f5467f
 SHA512 
85a8e0829341a367e5d0d4640064083b01b64f32d9b0bd1574d5d3fb4a4d4e67e80bbb06ed40854573d5651a235ed205aac66e26725146aa269894d8e437b1d1
 DIST patch-6.1.146.xz 6304812 BLAKE2B 
9863e30d45849ad733e500c90958d63210adbd46690a8a0e1688a39bba6337ac38b777cba8f63870159a47c191bae188919163cf081bbd44f197f2f3a28f76d8
 SHA512 
0ab0a0f42ae4c83fd440ff26e822de1326980372a990d3eca2b3247462ee2b5810de00d9e3fe9cef5bd58d5a9d968971325e255df1569d5d6f66572c816e3e81
+DIST patch-6.1.147.xz 6320180 BLAKE2B 
d109214e0682653ead5f62f5699d0bad2764bae1765789720d780e74afefadc39faf8e833df1ee4cc1436e4db5facbfc7f4ba8c3b657fc48aabda3ab84a4b540
 SHA512 
2cfd04771f982da4b65caf53cb944bf9ae2888a32005428adce383c408c35c72bec5d88e49670deb87011f0d6bc329e0a53adcad065aaa716ad5c8baffb2fddf
 DIST patch-6.12.38.xz 2489864 BLAKE2B 
d19f238739698d9696a5d1f6f7d506dfd60163532110dfbb5e32e6c42790dc7ffbd79f97e6ffa22b276854081f0d7c2ca3792dbe53bc75897852fc4ae3b473f8
 SHA512 
ba24b744a5ccf441234b59a274d6f7d62e082144aff05f4e7acd0cba7c36e969536073e9884398a25e113ccbbf6c938d1e6e068e8d029a8650d7b62788c0bf58
 DIST patch-6.12.39.xz 2528176 BLAKE2B 
14e84ae5521b713099716e433e62ec6efde278bbf3c17774217691a198e4b5b6f5376f443da8d856ee452004e2a883bbe1333aace95417c1e6d7ae563212b6a4
 SHA512 
fb9e76731865aa502d8baeadab660306d6ca89e0b128708cd7e187c03653f06dc3db8fd35663ea7c26920e1a050a4397d52d691977397e4252a8ee25d0ff009d
 DIST patch-6.12.40.xz 2557804 BLAKE2B 
d50f1197d02cf3ba65e6fea43323ce72dbc1ab963f7dca687aa50d4d3576f143dc664670889557aff647722541c2c84ea8c6390afcf3bc14c92abfda73441064
 SHA512 
fdedbe0e4f7f997e808b1e26dc715a3b5065839d38ef46aaeac298073448ae14591b92e95ee5c438e11b9b166a0d322c802aca1462e4632737000f4b697e6b9e

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.147.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.147.ebuild
new file mode 100644
index 000000000000..aab39f257d7d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.147.ebuild
@@ -0,0 +1,148 @@
+# 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
+SHA256SUM_DATE=20250724
+
+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://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/patch-${PV}.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/sha256sums.asc
+                       -> linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc
+       )
+       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}
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="
+       arm? ( savedconfig )
+       hppa? ( savedconfig )
+       riscv? ( savedconfig )
+       sparc? ( savedconfig )
+"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( >=sec-keys/openpgp-keys-kernel-20250702 )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+       usr/src/linux-.*/scripts/gcc-plugins/.*.so
+       usr/src/linux-.*/vmlinux
+       usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+       if use verify-sig; then
+               cd "${DISTDIR}" || die
+               verify-sig_verify_signed_checksums \
+                       "linux-$(ver_cut 1).x-sha256sums-${SHA256SUM_DATE}.asc" 
\
+                       sha256 "${MY_P}.tar.xz patch-${PV}.xz"
+               cd "${WORKDIR}" || die
+       fi
+
+       default
+}
+
+src_prepare() {
+       eapply "${WORKDIR}/patch-${PV}"
+       default
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               arm | hppa | loong | riscv | sparc)
+                       > .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