commit:     a10908ab57b0ad206a8bd1110f782ef0b5aa40ca
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 14 16:02:55 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Nov 14 20:10:10 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a10908ab

sys-kernel/vanilla-kernel: Bump to 5.15.172

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 73369e389bf0..f952c72ed260 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-5.15.170.tar.sign 993 BLAKE2B 
ffe5095f8006744245153d3533f4439ed268fad
 DIST linux-5.15.170.tar.xz 126720052 BLAKE2B 
12d35284d42903525dc0225b7ccf0a5e951165f5114f3963f24a52d1289268763e46b09e24217bac2323de8f352264e9c99bcc7256c1b3025b1289f3bfdaf2a2
 SHA512 
521a3b178f6979f7259ff46aa42722b07fa716d7883c617729972a78b23737be6538827263aad998f58485763f6ddb58d80ff769ab1447825dd870cf2744f038
 DIST linux-5.15.171.tar.sign 993 BLAKE2B 
c860270ce6e6910b50bbcca863f84b8ddfb1ba22a8133af2be30d1d444ee4319322846593a1323bbf43ea9e75fc1da5a2497b8f8fa220254b31e710fbe3ecc66
 SHA512 
b18b77962611fbd0388fe9a56b0ebf0206d0e76a1d2eaeb88ecdbe0405bb0186d7bbe2126c49b8397dbd67259f2d7b9c4b0a7541e7614a105cd4a52f256a4549
 DIST linux-5.15.171.tar.xz 126708808 BLAKE2B 
dee5c456d5d31411c8d03d9326f8785e65eb3116303570f683971b7ec7703e76975c9167225f4960d6cce90302df2fa93a0b2f69fd4e8b80d91313edb972de4e
 SHA512 
706ad0af33a1769e116ff9f7043dc781daa7ccb918ec2a820cb1032a633e2e92d06befe78c73178ace4a4741ba55ce93f761f80527b0256f5622a74f93ecb92a
+DIST linux-5.15.172.tar.sign 993 BLAKE2B 
10fe5bcc92e859706c1bd10c01fa6b7e499045def15f63f4754c79b7365f57b5004822c1c364c92d8453fa25c172395eb2f69277bf3f012317c0ff4d5e499f92
 SHA512 
993971c7d5cf78920fe5c9a133d23a6f6ec17f288501a1a3742ad64af157c4efd584e02cabf0523e6ce0135e917d4238b41f4ef66120f9bb3c31df33def7cbb9
+DIST linux-5.15.172.tar.xz 126696200 BLAKE2B 
aa94b041886bc8459bc687fc0079c8e4240d70c72101685169995d0842889f70daa54cf73c9154efcd74518ed49164e7cf7cc3dff36450718e8c6cfc2041705a
 SHA512 
d5f51b351c6fbe8fe210c93899313b6ad4701045897ecf62cb20572e554993e135ab3946b5817186a8de6cab1b6344664e7882499861faf048491edecd0d0945
 DIST linux-6.1.114.tar.sign 991 BLAKE2B 
9b4b59689d896ef9a00dd2386a7378d3a96aa55e324f045904771ec5c8a9423208ec47666cac6ca611b6417db9b7ba369828d5e77cb268db4d2793df0969d2b1
 SHA512 
8b613709d8f6cf98aeee5579c0d6cc76cb99bd494bb083f56835bd0e3ae7dad8565ac273965f2eedbd8453eba574066e57cb297f9d5035dd367a8bb7f2e1c574
 DIST linux-6.1.114.tar.xz 135213612 BLAKE2B 
879ffaaafb2fafe57d99a614d1f8065f4b8e6fd60c43723d815a66e226caff6bc5d80bca7c9cd1bb7bec1a170cfd3789c4b9dd779eaef1530eb61971c9925e12
 SHA512 
6aa571b2489b075824698901393fd80b48a5cd44142e28d7fc71c329756adf8ac9a9013b86354a57d82dd155ba401b993837f1cf6d80d367297b741602542061
 DIST linux-6.1.115.tar.sign 991 BLAKE2B 
9639c64345c544bcb442df436ef400eb87096c6a9be67e5e24271e0f564a35b0603342fcd88220ed92b984899a09a77c7d4c563219e7af719f5d4b803a79a0c1
 SHA512 
df318b8af07dbad930c9468dd195c26c8e9e76aa61a9e79983e4c14b89df9b3e5bd1ba0f372db0731dfb6d0f52bec2456ab13e5935eb1924ea3e1d0b52d16632

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.172.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.172.ebuild
new file mode 100644
index 000000000000..3e7046d330c0
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.172.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2024 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=g14
+
+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
+               einfo "Unpacking linux-${PV}.tar.xz ..."
+               verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+                       < <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar 
-xf -))
+               assert "Unpack failed"
+               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