commit:     22fddd6cbdf88be3b9b09bc4f2657791e4d4c626
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct  5 15:37:57 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct  5 19:23:32 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22fddd6c

sys-kernel/vanilla-kernel: Bump to 5.10.147

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 2a43377c4118..effd615e0097 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -29,6 +29,8 @@ DIST linux-5.10.145.tar.sign 993 BLAKE2B 
43d8eb782689cede573c80b2ca97888861f571e
 DIST linux-5.10.145.tar.xz 120488988 BLAKE2B 
31710012212beeaa212d50130291ce28851a6344f1e55b6a6d6efd7bad07f3041662b48d64e3928835c618e730a705be7cad7f58993b65901fff604fbbc4cbcf
 SHA512 
579495a91d0b6c9904f1836e30a3e34c384b241dfc62a2840f3ded99099ce2a4ddc823fd6b43c85c75b2a4883658143f94fd3c12d285c7e7aa9b6dc95dd4a243
 DIST linux-5.10.146.tar.sign 993 BLAKE2B 
7514e96fe2f3467e20b56552bc1371ca6f500908cc56fa0390ae1f09ad6ac83697749e6bbb3e2fbaa988bf28f74a84a745eb6b745ab499774933d8b723a7dead
 SHA512 
5213a12c84771fffc2933b1981fcefba93d5ef65af40e29ec503c6b94f72b37a359a339b6e0f569ff68c1a3fdce826695f6ff99dc0884511c7a883e8f5a9d0fd
 DIST linux-5.10.146.tar.xz 120482760 BLAKE2B 
74f2e859bf702d24250b5d468a51fbf1837ee21d367dc0dba666ec8a75b3bdd2715eac29dd0a2659181097ef9630c7ef79addfcbb8690f270dd3fac169702012
 SHA512 
6bcca84c006025e56c66b468f1ab77e6678c16f31bf945afb3a69fbaad40e08dfb6813db2cf48be87f29910035e10ba385d79480908638320f8ce9d1b0b75c91
+DIST linux-5.10.147.tar.sign 993 BLAKE2B 
c2221f77472f6deeec0fdf53dcac38ede2d0870c3a2fdab2d753a2a1b5cd838b932795b37b760a6d01279c357bb377b11b50cda281e38d560a630d67b9833b15
 SHA512 
b8c3fc57390e9675876c9ad8b4298f9b50f41967480b132b9893f35161b6121f4fb303069d4df320edce648ee3452cc6238617332c9715a11f9e91bb05db5be2
+DIST linux-5.10.147.tar.xz 120473624 BLAKE2B 
336e72f74ee72daa14319e7c124c199795d1d5468c0f4a0f4517ea27fb04eb03aa08995059e2039d6ecbfc1468c86bfa4053743a26362eb3e87accb0faddd636
 SHA512 
e080cc0d93ccda76359eb7042c44420e5d11b117aab8bab092fab2eec6fbd308294d644b9b8f75dff9937c2dd41e25763f7c9e008be4906a155b0d938e0faa3a
 DIST linux-5.15.68.tar.sign 991 BLAKE2B 
04b977efcfbf7af3440ab18308a3ff849f4294b5d4d12695be08cc60cfdd4fe9f48fbd4d1218bbdb2ced9d539bf15b9f9050c92f258669967aad733d67a69c3a
 SHA512 
c4928e896e59ce19d63ffe395b77f85507b329592e79b2d6f285cd48e7a57726d3234e529f29dcbf277acc7864aa63ea604a2fab08c7c3e74c1f0d3c046f196f
 DIST linux-5.15.68.tar.xz 126445616 BLAKE2B 
b97474cbe59654ac29a5f514c08a85db9ec330f58e08de53386d4fcedeab3845d6ea5b55e478a49fa94466eda296f80c7835704e2a13d1d56f6e38ed51953ca1
 SHA512 
fa62e3061a84c7fe79eb69e7c4fd4bf77aebb11ace53fe2bc5a63629a99115d9c406992166ae84526d8854af57cd9cfd173191877ea6639a5fc3c2a60ab22931
 DIST linux-5.15.69.tar.sign 991 BLAKE2B 
437ace51d1e348103c3003148fa75033f23e5ed4d37ed9a75771a066a2dfa56bc2ad455872f1736e3ff9bc7398807ffffe8fc4d15bfa585b7e4a0c0eec92c213
 SHA512 
34c46133123ccb339c4318e442f63bcb508f0c2696c5bcdd4999a2b0a7be47116736dff6605278d549f3b227c943b3d5844fcd42e9bd632f6053aea7784f2f5f

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