commit:     faeba4dcc273e5b6ab311e8d03f4737f1c71010d
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 15 10:52:38 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 20:31:13 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=faeba4dc

sys-kernel/vanilla-kernel: Bump to 5.15.74

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 41e0c5266472..2108ccb04d2d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -30,6 +30,8 @@ DIST linux-5.15.72.tar.sign 991 BLAKE2B 
90bc5b088ab8c44f9b8bf96934547b07090f9dc2
 DIST linux-5.15.72.tar.xz 126456132 BLAKE2B 
cbcee67d4d96085f954bee66e5270c36587b4407db2b66ae7ba6f514e3f1f09878000cee18984bbdd21aaa1278ad6b47141cfa50a0a5e96c921c5371e90319a3
 SHA512 
c6288f664cdc02711382592493c84152f2139b8aa0cdee7d448c7aa75363028a1b7ade15414e7d9d42501f754a6d8eaeeb2dc663ae3b3cc95e9d0882d5aa8d1e
 DIST linux-5.15.73.tar.sign 991 BLAKE2B 
bddf3d467612809564144f139e09ee0fdabb8756d99476d5ae65a307792ff42b94964b94b35afe2ae8baa13f3b079aafe9c080121a9b8f67a335c767dab6f407
 SHA512 
bc82810d427deab2ac8a5b12f18c1d98290744ceaf5755156dbc9e604830522b6cd0a615a771cb9984746716f17e51c548c6a264a589113afa565b8971655452
 DIST linux-5.15.73.tar.xz 126444132 BLAKE2B 
b8d9276aade33dc10069684dfa806716ec3bdde24f9f0363709011f6e071fd909669f7dee23f1b30506ac46230f2da82cb66e63d730fed6be430406c508bcd3d
 SHA512 
d32f8503c676c713211c5818eccceaf37e6f78ca0bf6269b194eafcf515b2fa6238656165d165946a758ca86d9e60c389c23d05e3c85fd6716003e5f19d05f6d
+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.14.tar.sign 991 BLAKE2B 
33280f855e00b93f803e6f982b129e199748925f5e3326d977c81a56bad08d7d6dfe762ebd1bcdd535fc64c6af5981d39ffc6a49827f984d69a5c9bd72ae02fe
 SHA512 
1162461100ee335a73f2495ef456ad32f1bcdec400dfc52fdbdd14929e2f1a87b3527f57c1d7ea08957c2bd607d89aff055e0faf6abbfe801f32ce93d9bca88d
 DIST linux-5.19.14.tar.xz 131644196 BLAKE2B 
459f07c79b36b9edaff06f4fb183bd209af2e51c968b2ee2883f9664eac1cf569b59e3fb9b943c1eef50362af3a41603ce367df1895a1f77571ba491160131fe
 SHA512 
19e584735009f0cedd08c94b2cc75cb6b0706a5aacd13a57995cab4f4a304bec42e9f0151bac1712d117b88c211fb84092b6eda723f9ab06289f37930ce1079a
 DIST linux-5.19.15.tar.sign 991 BLAKE2B 
aede577f11f17168beb5a24e45cbc3f4ade60c9d7df70d7584d829577b5f55e34cac4b546e3f36b8284e011e410c127928970386b2e14993b0e92352c9d2996e
 SHA512 
a7a94b95d1dc5b3f9fd8448cd8ee4c48671cca724aad3cfbec60bde36ade6c0abebaa392f35f4f2c0530914c1a9b63f5df351a072c21ef8b3dc450cd0c2b7c7c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.74.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.74.ebuild
new file mode 100644
index 000000000000..e9d460c7094d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.74.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.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+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