commit:     24af3b53d863d3b233b3e25e99da3993f7899bbd
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 11 07:00:52 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 11 11:50:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24af3b53

sys-kernel/vanilla-kernel: Bump to 5.10.154

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index a8527a515a0e..5e27b9ccb84c 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -28,6 +28,8 @@ DIST linux-5.10.152.tar.sign 993 BLAKE2B 
4af67d45d4f5dd206229cdd93aae79b5abfc3d3
 DIST linux-5.10.152.tar.xz 120491304 BLAKE2B 
ee1d2d3e26aae3a8d37d4ada0be09f49f97547241529747f38f065fb50ebc08e495dc25bf9ce74b50150971ee849f0acdc59caad8849129c5d001458ad672473
 SHA512 
d5e09db8d446641a074e0e98d9b3f0074c97b415df9a1e8bd1cce842e810cecc50d748c0a18899e8b626934f60e587d66a74702622f4d8cb1b84084007712fed
 DIST linux-5.10.153.tar.sign 993 BLAKE2B 
77fbc88777e847df92e599e18820df05dea51ceae58bf569a129c8599c3b246bc90ec04f6bb19dd419e7d5836aa0feb5adad6ad77225f97d849a5ab3958745a6
 SHA512 
cdd0052fa87feeae76e84cc7153f48eeb9a09e88c6ca7eea664b809d61815e208ff5261144cbe6ea266c40e1bb710376f06d08dc0a5da1614bb14dc3ac0c84f6
 DIST linux-5.10.153.tar.xz 120495320 BLAKE2B 
785fe2ce3fa319035399390416bef2382a5968e083d511abfd0cefb8063955441bda2c6c0f6218700ac8c8a4fc8da351d64c3cc83a60f6a7809761b437e66234
 SHA512 
e1ba359357f3b6197e7f169fcdd90023c4406f3896c51a0ad87faf1930ab050fe81b4c2f5efb5fc3c244fdead510423e802990fba47f1d9fe6c1a8ca9b95623f
+DIST linux-5.10.154.tar.sign 993 BLAKE2B 
066af4c4854bacdf5ca7ab5c2b29d83022015dc4f4424940c92be4c25c9d909754603ddb04dafd569d0af9e010207149214f30187814755b156e50fb07c8babf
 SHA512 
4f910fceaa2dbd3daae32fa8d7f108a21e2504bdf746c8ca7b4fe895cde21132005ee1d46f5d9f92ba1b27525c5047a5a95c8fb3d65a09d3790a7218933e3c1e
+DIST linux-5.10.154.tar.xz 120524920 BLAKE2B 
e40897a4a63f9c84ebfa86f39687302146523938108d3f76ed54ce78ee4dd30c38b0a468ce03e9a033dc5e454f0cb23aad36bef0f221b861686c0b4051e8c596
 SHA512 
73a13943a037a5003316e825b83da04e453e6cb6fa54438df8f8715af1595477af9aa0fd880be97eee80b11603cf9c29ae74f36af6e03fec9120b75ef1b76114
 DIST linux-5.15.75.tar.sign 991 BLAKE2B 
ca3ab657a1e6d98d2f8419c98c5f41beba2cba0bcbed937c4233bf8d3222b362bd973b435bb5fc987ce9e9714dbf6ddfc2265c7ede51196d66df0234d904fe7b
 SHA512 
81b5b73b910babb8a7b3d060c3f826f3da687fdbb8cd83fb55848238f052e035677549ea59f41636bda7dbe1ee5949e043c70e0c3d501ba1b09e5ad4e27191a3
 DIST linux-5.15.75.tar.xz 126466096 BLAKE2B 
cc913d15da3ec8389f7eb2b0597281a96465dd92245b4ddb41eefd76208d6672e6c83b88bd8d56596b553ed2c07e602e604038ee44c3b44325b3943fccf10fe9
 SHA512 
6cf56319d2bfbd27a3c01197d9ea23cfb3acbf83e0496889c6fb500c52a399ec852f965b7e9f54f389b3229dcf3dce8b48b278e5063d077936c8b8337cf370a6
 DIST linux-5.15.76.tar.sign 991 BLAKE2B 
876831fa3e2838bcc1785ba8a8231a5a50dbebe587105ea892e16f82a513383b8c920cc8c1025728a3b17d430f861b1c9671c544c5597b47a0ae226d79f1466b
 SHA512 
4a6f18f6ac9f3ee3668778bfa1b1288f78b865fb6e39d20efb65604707ec0260db5ea4cf90b1705672853e3997e1cc8b775439b86925b7c4e5cbcf343a4bee1a

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.154.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.154.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.154.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g1
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="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=${BROOT}/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