commit:     305800ccc1fb6b29d4145d9bd05a4e6241d14d4e
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 31 17:39:56 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Aug 31 20:47:31 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=305800cc

sys-kernel/vanilla-kernel: Bump to 5.10.140

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 9bb38abed6b2..dc7df151bc13 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -22,6 +22,8 @@ DIST kernel-x86_64-fedora.config.5.19.3-gentoo 224173 BLAKE2B 
4f2afeff3d1a3f71fe
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 
0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200
 SHA512 
f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.138.tar.sign 993 BLAKE2B 
611ade38fa49fccb98deda25a5148b93151ab1a82508b0e64f14a4954bc464784be60c3a957ae7005aafa53639dbd087ae8c8b2882ab11aaeac95101cdba8fab
 SHA512 
0f4bf52d9db557e6c57e73a782f53fb67cf54abbd1ad6b790559aaad50e73d0be37df9f487fee3a9211dfba5effee2bfba166b594dfbbfd691b00790403a13ec
 DIST linux-5.10.138.tar.xz 120492696 BLAKE2B 
c98d0fb69c29524485efa6d5ee1b45996002da0ec28c1de031a32354e1e93f9ce274e80e595451b0057b8273c8067580b82427a199d25e879e9368e123a91825
 SHA512 
a308319046b914b5c3e3864d04c8d618269cc87826c77703f435419f467488c1602819e1ce80fb3a8780360456615292ea161053c326b0acdb22138d9a1f5805
+DIST linux-5.10.140.tar.sign 993 BLAKE2B 
bf0428036aebe23af73b783d29c87ab99a068f0947d2fb57c436873368a5c93fb98afd3a8813dc1aa28fa8c257a7189c399803b3e54d070760a5f054f76deee1
 SHA512 
47d05a180528cbcf92b527593bbb7caca72113224e8340be8aba77846cb08128402df2173034eb540639aa75588fac7815a0905833486bf36cc37a84770cb3eb
+DIST linux-5.10.140.tar.xz 120465880 BLAKE2B 
3d0b610a3869fa46d3a3e28d839d84600924b3e4ae7560ca7d0fc6506572bab18550b16e0dfb357368bb9679b29f69efe627f12d79c8110b280cfe1d1db140a5
 SHA512 
90adb9ab6d3cce058840cd2b286c7336c436a409210e651cd065c5089fa36b6d22e03c48e7eb681aa79b7899e77176fbcd39927089ef5bddc1bebfbbb69d694e
 DIST linux-5.15.63.tar.sign 991 BLAKE2B 
855d118b3164e1ea14789647f173000eaaee7dfc27f27da497c1b6fb787b35d47269d2c233f0a79aa3560be7a1c9571b2c52a8a78fce1d73f400d9d21a17b7c3
 SHA512 
99f256fc013ee63c918eb521e741347c958a8ba018d5136e960686952fbb510416a80413d3dacc5a994220e6d8866a427ed8476ec172f48c03f34be4b93f33ac
 DIST linux-5.15.63.tar.xz 126441480 BLAKE2B 
95264d45411bb0ba30b0eadc2847075d0763bdc22aa86b250861ea18066a1b16b88627c61d0829d7b0a21e9e478df064a54b343ecb2065b37a011bc0cad986c6
 SHA512 
a1b33476484b9ca7a105d07b70835ad7e7e670750e6beb428ce23fe1bd853d66cd8a1ffca9ee736a98a42b98191d290127e628d33118be971c661e2fc6faf8ca
 DIST linux-5.18.19.tar.sign 991 BLAKE2B 
e4bff93a2fb9c06613f0aefb27e159e9ae0526c22112dc46aa614f831af9d3ffa1db72131d721133393893285934a2e6b2cddbeeec585e8d6571ff1975172cd0
 SHA512 
bc2e414ee13d75ba80136730ce49125ceee9bf6ac82a81586dd39d3805adc03e24dd433da7cca60380ad0dc594d60729ffc0b754aa542659845e74a7aa67e0bc

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