commit:     f2c9f67aebb46d655dc87d91d057082f98bc710a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 26 12:28:42 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Oct 26 16:37:58 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2c9f67a

sys-kernel/vanilla-kernel: Bump to 5.10.150

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index aadc25b95300..03f34253e794 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -24,6 +24,8 @@ DIST linux-5.10.148.tar.sign 993 BLAKE2B 
980955d55989336130219d93c49555ea5942c99
 DIST linux-5.10.148.tar.xz 120497176 BLAKE2B 
a2d356139a2549ed9f1bfc56cc0b2d61efea87f3a6e4a369c222820c0f5f36f99c0962fe52754f5d897566fa69cdea739536d2f98fa483ae1d7c7d04f25d3d89
 SHA512 
9cc354a14eac22cc41a0bcaeff0f6ef0a734713df45b15aefa120fa3eb5d7a6baf0e262cd702113ce37a2440ef826ee9b54117ec3976ad58bc6f5ba5286f755f
 DIST linux-5.10.149.tar.sign 993 BLAKE2B 
040884b3760aec4b52262d43f9564ccd140fc04713a8ac9962e751e6667e146d1d9b093bca89954964995dabaebf0d460f53153833487126feec3f58119b8da8
 SHA512 
8376831fb40a38b89fde56d094bb99fa8f2426e24e1d159f9dfa4bd345eddeca4564b3bcefa934a11189e367cd230d236090e347c1d192306401f564085ef4f0
 DIST linux-5.10.149.tar.xz 120485608 BLAKE2B 
8dda48d365c100e65757b51fada6764ea83c6ab2b521c16ba2dd32f545bd77d2d4c5dc946b02243f56f2fcd4e0df6edba68ce50fc95c93306e96a5c94353b8b8
 SHA512 
25344d9da8f7504c5ecc579506de418dd5e35f9029c27d7e0085d4510c4ac37dc4c6e6bca173446986fbefcf92f3a3fc40b586952a81a16d0118f79a66238b68
+DIST linux-5.10.150.tar.sign 993 BLAKE2B 
0ae037ad070f0ffb6616a2975f6d4c2f3a1146d37041477e4bae099f81a1c37eb65e067ed43a269f33de28f9245630c24d43fb1e09ff60e9df2ca9e5b61bbdfd
 SHA512 
1d20e28dec05e44586f8a7a4d112b13feb94dfac0b9d1f79091fd5653f79ad92dabbd80f8835ed0e0881d37617c4f1f1a31fdd265b883384d87cd98bed9ad025
+DIST linux-5.10.150.tar.xz 120500048 BLAKE2B 
159868086f4571b88445424dd08d2c691bd97e8842814b00ca32113c6306ede05be3ce90aa541b29e65f7df4cb3b13aebb9ec4d9a83abb490f163d8e79bdb2f6
 SHA512 
a671b19973977652dbcda078b1fd7d810b994c8096c0cfcdf9e5c4c4acf1ed6fa56dc64acefe96b2d7ea555480f0560e9fc80350aa4cf1afef98f9e7bbcbdccd
 DIST linux-5.15.74.tar.sign 991 BLAKE2B 
5f7a422d394ed9942d08569927d746ec5f7ae7d21f99977623bad6816f7a45c2ad940c5cc61f554e17efb57321ef67d0389198f4ebdfc97dbba214b9bd55579c
 SHA512 
d97e81f7a037435f91527f4ca057ae62c2d9f391b14df5dce65fabcb68b0feab2db6724acf1b3a3c56d57014c6f52050cd8fbe8a8248656eb81337ab53e10b22
 DIST linux-5.15.74.tar.xz 126457328 BLAKE2B 
bfff9c714c2073444b64ed295293fe98b92a34631826da4c378f2ee15cf866ca844ae9bf659457bb9c4b135803b2db12a1edd68e64134506850748ce24ff0733
 SHA512 
fe65228eacf7ed9ccbcd96c84a11d5f9c62aee9eefaf7cdbc05bac2d700a4356a8a856d4d756358c28068505903ea419fc03a12a5add1a5890c9adf61fe80b80
 DIST linux-5.19.16.tar.sign 991 BLAKE2B 
eed8ba71c0c0247a125d8f9babec75d0f9ead0b034123862e0c1ad8a5513ff1ce045cdb3fac7c822bd97b5926c068849aa647fd8d414f3f236baca8825ccd4d0
 SHA512 
f89d029af39a5b70b37465f91f04915493d3b1a0f2fa42160e7b63261b1639d2b75e395200c5443676b3f2f619014e46fd715ea0f2a1f2f9a2a6c22df73fc972

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.150.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.150.ebuild
new file mode 100644
index 000000000000..beb11365e70a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.150.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 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=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