commit:     68912011eb0411bd7c5ed51de25d9e291208e288
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 25 17:47:06 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Nov 25 20:13:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68912011

sys-kernel/vanilla-kernel: Bump to 5.10.156

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index c43099a1f171..bfffcf8f15a2 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,6 +36,8 @@ DIST linux-5.10.154.tar.sign 993 BLAKE2B 
066af4c4854bacdf5ca7ab5c2b29d83022015dc
 DIST linux-5.10.154.tar.xz 120524920 BLAKE2B 
e40897a4a63f9c84ebfa86f39687302146523938108d3f76ed54ce78ee4dd30c38b0a468ce03e9a033dc5e454f0cb23aad36bef0f221b861686c0b4051e8c596
 SHA512 
73a13943a037a5003316e825b83da04e453e6cb6fa54438df8f8715af1595477af9aa0fd880be97eee80b11603cf9c29ae74f36af6e03fec9120b75ef1b76114
 DIST linux-5.10.155.tar.sign 993 BLAKE2B 
f18041ad4bb9034d09bc14b0fd0547b60fe34349fa61358f6bf3f2c4ae8d180e4f26cb1afc022267f621e8bd1ddeb036430ef02625c737bc8fa1bc4f76fc5e43
 SHA512 
48e44a67c2ef4ed498f60fbc57e38b27353c178c773f02f13779275f40361869982eab0fb67c4ba2d791adc4bcf1ad375e0d3d04299d14d8ef1496c4f1787502
 DIST linux-5.10.155.tar.xz 120504084 BLAKE2B 
c178868c5347831131b9633c9998738500669c9f4230783a693a4fa6d8b37dddd3fe729c0a57c051ce33943ef99a992ca01647f2fca7dea7c76049ba87eeedc0
 SHA512 
fc763f7854ed5e8964fee2acc2f521caa215cbfa76dd7a054173fcf37f74ef543820e7b026c0ee2c01c178eb22c89ad334ec9559950772ec278d78d95b32d33c
+DIST linux-5.10.156.tar.sign 993 BLAKE2B 
52db65697829b5ff0aeeb6e781bb82c83d79cde3f1f8ab8abb735ee15ed74a09e0915ab2d7295152c596e0c6ff615ae1115968f4aa931804a4e177a434e898d2
 SHA512 
ef1e5d7b81b1b591d4de3e7ca7f26c327c5ee31eae3bae889833817be71b75268f403043a646f837f4f10f0f4fab6251aafbdd9c3f05d3a34df8507e194f5842
+DIST linux-5.10.156.tar.xz 120497392 BLAKE2B 
4bf8a02cec0a9cec6938a1fed74ca9a8418cfa68433d87dcacfcb4a0f409f3ddc184a0e1157915ce79543b95a9a91d30665f57430e1e290482b08da692c4f11b
 SHA512 
a2cde98dc8f5e5b9a84db0f8adb4e2343e3873068f4dc40676738f9d1f1b7c82670f62c9c4a9f4800f6196de2f79f3ba071ee3f8382c304d16c6892072d72900
 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.156.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.156.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.156.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