commit:     b95efe77748690a6dc14f6535cfd29c3448392cf
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 27 12:36:32 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jan 27 15:06:05 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b95efe77

sys-kernel/vanilla-kernel: Bump to 5.10.94

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index d1bb3d90e26b..05491d83bd3a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -14,6 +14,8 @@ DIST kernel-x86_64-fedora.config.5.15.14 223321 BLAKE2B 
7605b06ba48c40841927a4f3
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.93.tar.sign 991 BLAKE2B 
99714d74793b5012c4e2767d796655002b31098b5e7c3c06c125030496f6586955b08fcfcf2ed58219a7e2862eaf25f44a751fd9baf42f60874acb775fe669c0
 SHA512 
cd29eaac1f172913ed47e45741cfd246b23fcf21613a842d617261a3eeaf57f05fac9402e85c0e69eb42bd091ec795c2b2892adc79a63de49c8cd9bbe8dc7c6a
 DIST linux-5.10.93.tar.xz 120342268 BLAKE2B 
a174f9513127835a0753cde0f26d14a929563f703a8ba2343e1b09dc3089d96b85680c9d7f49e2d3860241ce3e258a0443c861f143813709987378bea6d438ba
 SHA512 
a152188e394258d0694e7e47a05a109068492d985251f468f2b883881f1234f3fb269c9d5935e3299c7cc2bfb66cc7948e5d36f69700049580d4f9cf4ff1cc94
+DIST linux-5.10.94.tar.sign 991 BLAKE2B 
a4925ddb6304cb86a84353121989bd4b959bc2c791708cbf5e32b9221b9522f32d5419aa37576853e52e756ab30ecaa01111d62e1fb473bc64ea9be599aa2159
 SHA512 
26a90fd5d443f0aafa4c7f9452c51d1a95b06dac8b8215da3eb7b4f5f6b65b779503bd1d763b81696c5692cee8c202dec1a96f54a7b40bc815446cf7f4bdc9bf
+DIST linux-5.10.94.tar.xz 120378928 BLAKE2B 
274f1c14cda832d5e24a221c563302c5a5c2411d1411202226bcc92cac7bca537c61c648f675ba1653cd45993e3516bd91506c1b250f42311ee5db55b172705a
 SHA512 
745ac65480ea5524f7e3285c23c56788ba91ea220d63e7e68335c73ccd45759987165bbbb8be6dc6894011ce6300589e482aa9fe43fb0a1073253c537be173f8
 DIST linux-5.15.16.tar.sign 991 BLAKE2B 
0523e495f73946be58c751189eeac9eeeff5eb9869a9798bc742fcb08359529cc43e2bd991e998cefdc6f4ab3e3e8f8da7a8ee56b25bae266f2f144af236f568
 SHA512 
7ca0a4db533570a8ea8c12a3ca477adad8be94020da33a6e666676d5dc5a7b7f3e6eab4772a0122d1cf3bda39294f42ed2429798414d41cc5c89ab9ceee8a901
 DIST linux-5.15.16.tar.xz 126178716 BLAKE2B 
73b2f6a135c89db2ffbba8d8271761df3b98e0c844821367a3e009d67a5df27d11f02265eae34229b699c7308d4cf505f0f4a751a8135b6a6f0bf46929cbb785
 SHA512 
a2e3dbd92b2079a64af4d4a17db998381b5afe41ffb8b6b7fb43a69eb93b1c6d766b4b8ebba287d45f3de8392e4808cca5a7ccd5da5d42f7f58a57bf17ce5d10
 DIST linux-5.15.17.tar.sign 991 BLAKE2B 
fc33eb461f03a37408dc5fffa8360da639c0d6e30ecc60eb25879cf8988dd500a76b38e90b880311cfecae150b81491353dcc5da8241e5bbc4e212ab78ef46ca
 SHA512 
e68799de99982a71c8ee92200606ae5072cf58c8980bdcf2637bc75bd612344fdd0c893ffedcdec650d1f3474eda4d8df3083ca27c16124d6d72ee5d00ca0288

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.94.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.94.ebuild
new file mode 100644
index 000000000000..a462d2e337ec
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.94.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="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+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