commit:     872762ddb3ee475cb6fe47ca11105ff8ba6eb407
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 23 13:46:09 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Feb 23 17:03:51 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872762dd

sys-kernel/vanilla-kernel: Bump to 5.10.102

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index bed0c2621ca8..2b008a45412e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -20,6 +20,8 @@ DIST linux-5.10.100.tar.sign 993 BLAKE2B 
5f1de1e82b12d25802965038847a5aec97b2dfa
 DIST linux-5.10.100.tar.xz 120379824 BLAKE2B 
670a674351eb35ce33be67c05e2d91de3f9f3346d3cba5c419286e279a647cb901aed4506f5a50c28b36df0ba14f66f896dbebc2c99d459a3b8a6a5944899386
 SHA512 
c20da85f73f46dfe6f65c6faa1739816a514cda6b5caa78b9ee21030489a94cd40fefe09ba2017eec9b195ecafde3aa1146a353204adc7575413a0f67abf91cb
 DIST linux-5.10.101.tar.sign 993 BLAKE2B 
09edcaf2e47dad78efc4f5d551b0d382b2807b1c5d34f911884caa5834ba9f731221a67b0c0e73cd8e072cb56df98659d55ea4946db17e348e3015fac51f8a9f
 SHA512 
d54da62ac73002a6299b44c07fc41d4ff1c156cc73885b9324e458d677c9ca2bbb066e3faeb5c820e95b3410505cb1b62fb65b42c9bd76c3d24abfbf49c7e62c
 DIST linux-5.10.101.tar.xz 120405612 BLAKE2B 
138998dd71669ec8c9bfb5a2c176d8f336d6dcf96f749deed82505acfb0f1d658b792eb01e96569878b01d6aa5600bc29882b27933ae40681d575da56bc2718f
 SHA512 
930a38f82ca4a5a444a04fe71030be4dc10fb2447dcc73d88f3650e5239dc8a67116d4644e6aef1dad5f8aef17299bb6980fcca5a12522928a8409460e0bb5a3
+DIST linux-5.10.102.tar.sign 993 BLAKE2B 
10a0889848b5198b4bdfe131b34423eb0e0ce91b6df649b57d088e1116008a2d940060bc3b4ce9e24c5e91e78b8077a00c50dada776e42039b428e90e08b11d5
 SHA512 
7f20c13b2abe6ecb15f4d3bdc36c8d61b2065c60d9ae3f9310e1f763e2f7e3594df788f549b21d6961193de53c4b4ac9b589e243459de7cf9f8a988f2d919bc9
+DIST linux-5.10.102.tar.xz 120395768 BLAKE2B 
50bd2d608b193d25defaf347ca17bef198c46da9dc9a988510f038857a49b8054dc75adbf90bf48cfaf3da179bba776f0ffb1c54a965a5d7c3de19d648658407
 SHA512 
08f5a50cb48e0a58745a4825bbff49df68c4989c241eb1b0e281c69996355fcc84f8aa384069ef2323c07741240733c56a2abb8e85d25e122773ea465af5c57f
 DIST linux-5.15.23.tar.sign 991 BLAKE2B 
d085b784adc51f74b17156a43c22fa98221c80ef057ec132aa462ddba79bc193f1dd645a1a21e752ed0d5e52949b2aa77f0b1b7d4341313bfe3206013c8934fd
 SHA512 
880aca81e1f4bad49850b904c8f78cc63e8e1eafee27a912e655ed609b2c552e7a1076fffb557d8f19f0af850f917b2ee43a9181f4559dbe67a41161776b002e
 DIST linux-5.15.23.tar.xz 126202324 BLAKE2B 
36be53585e67350496a84438712d35e488b745e85b6981f51448d9b19fe30cce9968ef486defd8a68f556e2518d010bf6f63dbf2bf7a504e25568e71c3aecacc
 SHA512 
eb863fe0b62b7f2457bb66361fcb23a7a629a53dea3b23b26d012227d318cd09fd99b94763e88b593ead70eda1f58b702354155a043aed0ef1e68d5d1ba53ce1
 DIST linux-5.15.24.tar.sign 991 BLAKE2B 
1807f81e43cdec5b5852eb5c9df6f17554466d4ed946740e1fe7ff17ca46c9c5ca07236127563bc2f249d2b4516e83c08e600b680c415c1cd76d4074f9c55547
 SHA512 
3ad52f00c39a9852b3f370c5b74eee375c7d64307a0f93f73542f407b8f6e72da7f9de483c6bf8fdc96dc52c8c053fb8c152cdff88db6fc5621a3905708e046d

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.102.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.102.ebuild
new file mode 100644
index 000000000000..3cc9d657fced
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.102.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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=5.15.5
+
+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/mgorny/gentoo-kernel-config/archive/v${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 ~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