commit:     e4f4011c7c026d18074d0d65f96a527daa78d801
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 23 15:54:06 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sun Sep 24 02:28:30 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4f4011c

sys-kernel/vanilla-kernel: Bump to 5.10.197

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index c93c0ac92195..e3ab2fa57a4f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -38,6 +38,8 @@ DIST linux-5.10.195.tar.sign 993 BLAKE2B 
ad91706e4c42071c87eb9cbaea86942ebcece49
 DIST linux-5.10.195.tar.xz 120605116 BLAKE2B 
c9d27b206901fa4e7171adbc832f62064a148286b67ce3d95de145fc1d0bd1118c38af1b17e9925c3af653b47ec8bbc905535bbd5a5d3dc189d838b65f0177b9
 SHA512 
651b5c49a5bcd271fb85c0fe28315073c54efa84b8404418372c9722287eaf38a6250eb16cae924d8797acc36a2236a9f31ebe2108f04b9a75912b9b846b8ad5
 DIST linux-5.10.196.tar.sign 993 BLAKE2B 
146a48884d16444e951a717ee2818579cef1280d9a36759fce024085ec318b6b0da5f6da92b162d5a10a017d85413461f78faaa820646f91a3a4a5b4c081a9fb
 SHA512 
25019ed3cd33bc077e5793dd966ea9822613225ee242df9ee94a73ad2a6a1657362a36f8f529c13e9dd73c3078d103bae22c2364d61429ec17a3724fcc1cb96d
 DIST linux-5.10.196.tar.xz 120599740 BLAKE2B 
0bc18215cdf05c5aabfbbedda1f81449483c3a722c2b53a85f1c6d6cf9186db1b0da3f2c22f6cf7573ba93d594b2c5dd2a68ebb8dee588e7cce651ee9dac6bdb
 SHA512 
b2b942b11720a52b79bcea5a36b6208062e49769a003adb32b8ed5c132c7c760805c98194d5ad96312bd12368d8d6cc5e3c0aefc7595ad6f6ebb5590797faff3
+DIST linux-5.10.197.tar.sign 993 BLAKE2B 
a98f032c0886edeb2f508a86aaa9fb7981ab8038b33c46157df555cc5d7173fe365736361d2a3b86f04df89d35448006cc31c8b46b86b44d2d1583f26ecc4d2d
 SHA512 
c3dd76c362069777d041a3cbd54576119f67973f8f91b38564a077473e6395dd309fc2286ce295443896a0b6a7c133604e9cfcd4800c080c3943e2d34db082cc
+DIST linux-5.10.197.tar.xz 120607852 BLAKE2B 
83ef21047b45710724f7b3570b27d22a0dc1cda3eb051eceb5952481dc3d3f3646bdebabaf4458e8f03f027b56b461d869abda15b0ad92a684a0a43ce87bab07
 SHA512 
5a8dcf7788e556b4a416bc7425e9684d1a6c40c483eb549dae975e3ff99cca9bfa2237106ba618c787b7d819940b90e29bad396108068ddc95aeb7d3529d9a38
 DIST linux-5.15.127.tar.sign 993 BLAKE2B 
84310652ba933bb13ff2b0442eaedfcc56d94e0adceef77009abd7bdc2d614d1c61c83041b57adb62ac6591e7e127cb65f2557a29e6c89a616b84f07e89611ab
 SHA512 
b34247621ce40eb2131b1c5c320d0ffe706010439b81238a1d28c9bddee69c0ca7575f90c7df86a92af4a6da520f42624e5cc39462eb0abc6de74a006d08af9e
 DIST linux-5.15.127.tar.xz 126542840 BLAKE2B 
3c5f6ec2b917099deff2bafc2c144f06ddf2274f02ccee386cbde34323b7b7dc01b82f5914b0165c2e9dad48a13f4fbd22aedb25e7a07533be3becf90e7b7a9e
 SHA512 
5245a87e10c986657d42dc78d0789905c1e61cc0af5ef619f0ed73788b0192375a8996a340e693604305cfd15ba202023fa4f4575ad4a7a5a38edf73aac892cc
 DIST linux-5.15.131.tar.sign 993 BLAKE2B 
1ae63f986751fc0dfbc2f16be0ad28fc5db9d8d2d3367204c04deb0e33f0a1f30025b59a5d69f8071cc871f2f7d2a5431f4d677899e7040d22a612f6c68de476
 SHA512 
96f8961d2f32f144e3ab58cfb02175f5cc2ad829d1473dced4ebd53aa52ad281d723a55351d055147321fca7a9b66a63273282f6ea9d61879ce979c1391fc0af

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.197.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.197.ebuild
new file mode 100644
index 000000000000..de1f71e33f69
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.197.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 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=g9
+
+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=${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