commit:     d3bfb61d62f276e43af7568035051d2e65436a22
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Feb  5 19:40:57 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Feb  5 22:17:40 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3bfb61d

sys-kernel/vanilla-kernel: Bump to 5.10.98

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.10.98.ebuild   | 133 +++++++++++++++++++++
 2 files changed, 135 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 024df0158d80..caa4be862108 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -20,6 +20,8 @@ DIST linux-5.10.96.tar.sign 991 BLAKE2B 
f831c2a0879f1e0fe6e157cbaaeacd654d594de5
 DIST linux-5.10.96.tar.xz 120375044 BLAKE2B 
71c2a44c7a170532b787e5c60496a41d5173e7d34e0f5d60808e450f9e91204c52e2dcfce4e63eca44383ebd42cc2ab1021b7f110db03fa5d5f7596c9e53bb60
 SHA512 
c852b38613dd8dbcf2638854d0f953655a7c720d9a3bf4774cde61609040214358ce9f67ad94fac117f1815b4adc9ed8dd7423388c29acdc2a675b06219499ac
 DIST linux-5.10.97.tar.sign 991 BLAKE2B 
85a5a1000aafbdd300593955e887c4d7be5decca4b09d4f722e4330d2d1b2fb6fd54dc65c4bdcdb992d538ab372aa5ab3b23ce88ae462197d4ff4710d3ecfadc
 SHA512 
af193c493ff7438d856b70474157425e63e4a693e36d924058556460de7218391d31e2b490a2a6df5314ab5612ff839c2d39359aee79b4e3bb42459410ea943b
 DIST linux-5.10.97.tar.xz 120372392 BLAKE2B 
95246b084605beb4aceb4f747aa03a935347bc6ebd421853cdb63a1c26355439090532e25c61f73a5c380f03bf6c4ae429eea69afbf1d8696de1bd52bcc63c80
 SHA512 
c55dd97881ffabeea782a0ac377f38b171629bb75fdba95e91d06fb2567ff59363560cba148009a0b9fe9dcd046bf027e35a8efaf6a4cb60f8fd902cddc750d0
+DIST linux-5.10.98.tar.sign 991 BLAKE2B 
e181f7d5c579e9255e4cfd54bbc3d2c4c1c4d8fabcd8c636c8db6f80a143bfc5d1d12e738b239a107de190be1a131c64cd07390dc114dcd3bd33f61b045b2be7
 SHA512 
fdd9b18c945b7051d35b2ec167bffe9c65153a35590c01ab8d552c026e7c6b8a8e15c8098fe81de2168d1fb9b9c0e4f565758b95bc6dd85e4ca7d578bd7a3bc8
+DIST linux-5.10.98.tar.xz 120374448 BLAKE2B 
6cbacbc7f6cdd6a79b3296a1e67abb75f8bdd1aa78ea418fcfe5b33b9d0bd237c23361d1c2ddcc8d75682c5ea124149e35a47028de4374737ab49be1a97f5402
 SHA512 
55372bf0c0f2c9f663dd98a9a3ae05fef8f1d342fad780907afe27862295e7d2404d4f94018ddac6b0480387eec2e89f2770ad748b651eccf4dcd37533fadf80
 DIST linux-5.15.19.tar.sign 991 BLAKE2B 
80e62e341cc1c25f890bba25dfb1872842a9e6652cdbc9c7aeb8f16f9a958afba2299485221669ff710af68bc46dfeb4f9374e216f65712ec2b582fbb62ed3ce
 SHA512 
e870fce5b29371aa8ec2ccffc6041566e0194a0a04c089a26e1b0ab53ade5388cdda82acfe557db1fe5b67b9bad62348acc28e0f29bd23884dc413c46ba8a310
 DIST linux-5.15.19.tar.xz 126226608 BLAKE2B 
80f03833a90fa8dc233ecd6b75824adb5c529518ba47a95a7fc6d6547a5e1772e29ef88691516482f0185c46df26cd78eb3048bc865511e8dbbab661f6b1f851
 SHA512 
58dcdf71bd8d8dcaf2932b6b86a8421046d0780361ad6c4f2eadf3ce1805f106da894d0a6a62cb0919186a11659d7ba36cbe0e956d5ea7a5419e6f43698248b0
 DIST linux-5.15.20.tar.sign 991 BLAKE2B 
0d0f2a8a97a991af1623a1e3e49fec2974b9b584d32c8853a615aeace79df2f3d53cff74eafe885d0451b374772c2917a11913b00099e6181da7579396df5494
 SHA512 
25115588128f813a87d30f02fc44d5ab4bfdde1f31c5266f7807d1e8f853d9594c46079b666fd26a63be08465f946e380941a08e780f9f1c2923129cb60c46cd

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.98.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.98.ebuild
new file mode 100644
index 000000000000..3224bff15b58
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.98.ebuild
@@ -0,0 +1,133 @@
+# 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="~arm64"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+       !sys-kernel/vanilla-kernel-bin:${SLOT}"
+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