commit:     d799ec3f966fa4e2aa7d25cd8b1d98eba55a0445
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  1 11:36:41 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov  1 15:23:18 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d799ec3f

sys-kernel/vanilla-kernel: Bump to 5.15.170

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index ca39889c567a..99450a205692 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -32,6 +32,8 @@ DIST linux-5.15.168.tar.sign 993 BLAKE2B 
90d6895485802ced84e9be9d59389d3a7b0b1e7
 DIST linux-5.15.168.tar.xz 126712868 BLAKE2B 
72b50433e5c242d0b21ba104306ba632b24afb87f2166c42fb049c03ca91d631cb2714d98d49641eb4b457f6defd0d42fd438273916393cc60e417cc82f26e42
 SHA512 
8536e628c801ba0afd0c142748966da9b8374d1cb578ab518c9efdbca3d416bd0bb6393368569e1a868ccb3f74d2f56e12216cf43f79f3047b55f670fcd3d42e
 DIST linux-5.15.169.tar.sign 993 BLAKE2B 
36ae1b4cfb5204cce96e504f2ca10da2a569ac89bc5d7703fe8ae89ec8b301efd82cfb0f8c23921b06868391b8f648cee004a32eb88864b9c387d6ec57fb6ea0
 SHA512 
57712a56504579d3492c1bdf452b099d0559da6c65a2b422ded528030a4c7a8bd7174f06b66aaf9ca12036511d98cb9d411d3e2ec33962426f3deed936fa36fe
 DIST linux-5.15.169.tar.xz 126706236 BLAKE2B 
3d6abd967b995593f1617db755bebfbf5f5a79985951798b205d380ca53382d6af16de71f3d852d8154db60e2da6a6f87fc8bc6b0e60410538ca98bd5e3b4378
 SHA512 
9f02d7ee0737cf72ed34331db8c073578380290ec46913a9126b1c5c5f75c445ea9e17432707d5efdf8a5f4238ce7028876e8b6899d2af5a2e2919ef66e03470
+DIST linux-5.15.170.tar.sign 993 BLAKE2B 
ffe5095f8006744245153d3533f4439ed268fadb9d02d2987eaa54a4c246e7c15811720728a6622a65db03fd74d219c79ab1b08d7929248cf1470e8de859ff7e
 SHA512 
68fe98b1df9a92b650824e9bd3df38d18fdf2b3287483b770426595611809a29ad245f78ac7b7b84eec27394061b73503c61aec8c1ec900008392bc679ab4614
+DIST linux-5.15.170.tar.xz 126720052 BLAKE2B 
12d35284d42903525dc0225b7ccf0a5e951165f5114f3963f24a52d1289268763e46b09e24217bac2323de8f352264e9c99bcc7256c1b3025b1289f3bfdaf2a2
 SHA512 
521a3b178f6979f7259ff46aa42722b07fa716d7883c617729972a78b23737be6538827263aad998f58485763f6ddb58d80ff769ab1447825dd870cf2744f038
 DIST linux-6.1.113.tar.sign 991 BLAKE2B 
ed6603860c64bf1219118c3490e350a5f79cab52108a4c124fe4e099bd57df7850c91e6c66d828dc68eb38b9a6b023fcc86e071892092522b480901af566c944
 SHA512 
d56a28357329693e58c80acba1f732a9b81a7659306e403029e666dfa4a2482b7e82bc8b728f0037398c03e8da0808c11c9af78a484836ae7d5dbe7b50a2bf29
 DIST linux-6.1.113.tar.xz 135242176 BLAKE2B 
5a83f6542cb68eb19b851eda2d304732e3169433546b21c7bcc86064e6d1e888fe164d469f517419417398bdfa9b200877aa9bc83cb84f75e7224556ce5a353c
 SHA512 
75b9b37b57d588a47bbc39dff06cf9214894616ac3a28ca9039a42cce8cff1eb7ced304ae892d0e6502dc540444d7708844bbcdbe9ecd50e42f5979cbe69a460
 DIST linux-6.1.114.tar.sign 991 BLAKE2B 
9b4b59689d896ef9a00dd2386a7378d3a96aa55e324f045904771ec5c8a9423208ec47666cac6ca611b6417db9b7ba369828d5e77cb268db4d2793df0969d2b1
 SHA512 
8b613709d8f6cf98aeee5579c0d6cc76cb99bd494bb083f56835bd0e3ae7dad8565ac273965f2eedbd8453eba574066e57cb297f9d5035dd367a8bb7f2e1c574

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