commit:     9e824085a4ce547faae2dbae4b7919354a03637c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat May 25 15:55:52 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat May 25 19:57:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e824085

sys-kernel/vanilla-kernel: Bump to 5.15.160

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.15.160.ebuild  | 137 +++++++++++++++++++++
 2 files changed, 139 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index e8d14db0dd7d..915d468ef712 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-5.15.158.tar.sign 993 BLAKE2B 
4a9cb5b7eb5213482aba75ead47f0719a0e3d14
 DIST linux-5.15.158.tar.xz 126633604 BLAKE2B 
920a70642acfa806af9e1e6455aececd0490784990101368b77314082ccd99fe9a426960516f434a214932f01161f44ffb8b10fe5b91822e0213fb3380c0c93f
 SHA512 
e10f8df018a7e5b10a3769befdaeaba21ac8cda1ce278422b7049c5531d985f7f46c85d498a7ca1b45b78dee4a0157a62fba8818f88d45a7551f49f6f6201f8d
 DIST linux-5.15.159.tar.sign 993 BLAKE2B 
0c91a1a79f12ab1bc9dc4c43ce51b0db3c94ca91c951c87053a95c06e505e145cef287707305677408d66e3878b6d3f6a0ed330c6b8e7b6d3be026499731fb44
 SHA512 
0b55f074245512298087e181feebd4a37000b116acb4c26051997a644f66a34a68c69742a9333bcd26f129ae6a55dbdf50a759151d79a5c4b5ed564d147a4f52
 DIST linux-5.15.159.tar.xz 126638716 BLAKE2B 
72a6d23d69effd78f01e5809260e2f9449c8eba81e3721e4362496a4683d23a3a29596b8e0e1021940304bdb92d8538b78dcd3981ecd4aed5305cfbdfa774f93
 SHA512 
612ed225a3a58e87d8d561384d914f362fa3e3b8c2a8e3eda4a170882a3e80135aa77d444a44556ab1964cadc2d6b8b3b651f17a1f51d664ef3a24e535aeb60b
+DIST linux-5.15.160.tar.sign 993 BLAKE2B 
55143ec2dd01ef5d5ced58fc80bb5cc1ea0f54f593272bd0d1e988473239a79f8f8a92cbc21102e551b7a88ad5e263d0ad9903e5eb61df129abaaacb9c5d229e
 SHA512 
981651ebb138ca223abef22dd21d4b7d856aab0524c37b6418a6320bf39fc2af26012fb2c57027b0bc30f057dfabc61ad0150628f343f76046726a254fd9b420
+DIST linux-5.15.160.tar.xz 126646360 BLAKE2B 
1eb8a99444768acd9c1259625220f09dc8fa3bce6d854500fd2e6fd24a575ae20ffc7c4395c096cb7bf5f075b6cf478f128ec3cea40fed2c2c38ae5d241c91ad
 SHA512 
8d5839dfbf72024fe4c22e556f3d3c209cbe21d7682cfc86fad76708472eef87bd4c81d7bb7d5abce438b99855e4e3b9214c8d7bb31cc695b55b7ddf7d3d7edb
 DIST linux-6.1.90.tar.sign 989 BLAKE2B 
d053e980ffce442139f6db5151f4c5ffd94bfb70190c6547261a256fb94873712fbba0c0bd6aec6fa5e09c3bc6049f54817ee491e45147a0a9b1bffa18b49e74
 SHA512 
28c181281c3f9653810c44b6b6e833de3b6c1fc2fec452445a7d8aaf891da62343d2bf8f2802adea6e1fec809417b4df221d30b721ea6adbce9323c9c3ad9d38
 DIST linux-6.1.90.tar.xz 135133180 BLAKE2B 
839f183a9b4bac9f12a17d23d888856160acf7fff289dee53be4676fb77c2a5fc21a3fdfe9160e221690f3ea51bde60b54b9109ed457428f2fbc5e139df4985f
 SHA512 
0f16edca9dfa35830820c17508a87abf550bb1b1bbfeed78a7537b3c6c10e890b82524f3deb059f7fddc41d77e07a4c143c59fdeebd875e6795353f5cedccb41
 DIST linux-6.1.91.tar.sign 989 BLAKE2B 
2a6c93fa9a8e14dd41ef12e64eb735cd87cf27cfa7cb8d8f3d1a3340f5f3a7609820363d94b4a928a1db0054b3f2195d584b01e5c9326909941c6f71c169b65b
 SHA512 
88353a7089688d0a7b112f4836e500b0b934a2402139d33c99efec3fcbafc37666d97a89235449d82c9b25ff59a5b281045ba1bfcf67f73f474f6b89fe87d3ea

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.160.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.160.ebuild
new file mode 100644
index 000000000000..75273ad670d7
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.160.ebuild
@@ -0,0 +1,137 @@
+# 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
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g13
+
+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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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 
-x))
+               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
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               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