commit: 60d66458d25300319342684318effc34d2f2331e
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 14:46:00 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 19:16:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60d66458
sys-kernel/vanilla-kernel: Bump to 5.4.185
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.4.185.ebuild | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 2f4ec06ec887..ee70011c8c32 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -46,3 +46,5 @@ DIST linux-5.4.183.tar.sign 991 BLAKE2B
a56523b58f38558061c255d50caa0add22328467
DIST linux-5.4.183.tar.xz 112886604 BLAKE2B
6ca50d1a70753e385e6c49af92a155552905b61018c9bead37b997c40e4c2df9d4e93a337a5ee5a8cd210bf1f1962465513b0e9b4a70ba5617de8619925831e2
SHA512
23db82a808a55a6fee4fb72ddeb8a99bdca1f637e73c6d908e3b44922d8a3d53c2a00da93d91ebdfb9b04f5c492bc6478fa7535a77c1d269422c8faaed049056
DIST linux-5.4.184.tar.sign 991 BLAKE2B
e9eb40f2c9e9903cbd79353ec82abb1ce5600f58dbb3156be894ab9e4fc4ea1201db051f946aed8357d3ba2cea8e9e2f4964ae0a244b10e190328a7f98f4826c
SHA512
579e947f577405bd4d65ff7925485120b7b9d9db400ef0aecdb5aedfcedbc21febc0571a1f689a73c3b4dd4bda5b2e8194cea909507924acfb30690ade367cb3
DIST linux-5.4.184.tar.xz 112917548 BLAKE2B
eb623f5367bdd5ad6d4bb8b6cbfb15baa54c9769e811315d463247359a53df6976c47df923365b5199bfaf3b7b5c47a04a745954e3c52186795de07243742a6b
SHA512
83b203e57ea7f18d35197bf6592b8957bd382beb78c44cc5de05c30e80ce5ab02d90ac6d1415a785764bcf1b7ee4743f3b773927791ad78524667562fb216c36
+DIST linux-5.4.185.tar.sign 991 BLAKE2B
5508bfda73f95b84314ebb907181befe43615af569a15aa7fa01a27ba8ebcf60453ca4082e3a5c405d76bc0f5ae9616977237fae620152d41911e47de32797f7
SHA512
9004a8d3a414119e9c482e1dfbb4bc775977986b311aadd4f4c59d2acf10d0721c8110cae59eb48428e9d12dda6903d27d30f2bfc766a52e267f1a2c66573069
+DIST linux-5.4.185.tar.xz 112889592 BLAKE2B
f44cf6b306b254533f15dff3820bf014937fcec88c75468da84b4eb403cbe1fa5ca5a830ee5f73fb3c57b7af1510cb6a7ede531836e6599c5b044e353fa11b3c
SHA512
491faf373500757f77e26e4cb402b51bc79ef220ac90579b02fa2cd25f7e524873fe4b5f971a71d41d198baed9905154c21b70c0387c2ba2285d3f1da730e6f7
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.185.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.185.ebuild
new file mode 100644
index 000000000000..bcffa2897768
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.185.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.4.21
+CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
+GENTOO_CONFIG_VER=5.4.114
+
+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.config
+ -> kernel-x86_64.config.${CONFIG_VER}
+ )
+ arm64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
+ -> kernel-aarch64.config.${CONFIG_VER}
+ )
+ ppc64? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
+ -> kernel-ppc64le.config.${CONFIG_VER}
+ )
+ x86? (
+
https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
+ -> kernel-i686.config.${CONFIG_VER}
+ )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+IUSE="debug"
+
+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
+
+ # prepare the default config
+ case ${ARCH} in
+ amd64)
+ cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}"
.config || die
+ ;;
+ arm64)
+ cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}"
.config || die
+ ;;
+ 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.config.${CONFIG_VER}"
.config || die
+ ;;
+ x86)
+ cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}"
.config || die
+ ;;
+ *)
+ die "Unsupported arch ${ARCH}"
+ ;;
+ esac
+
+ echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
+ local merge_configs=(
+ "${T}"/version.config
+
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
+ )
+ use debug || merge_configs+=(
+
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
+ )
+ [[ ${ARCH} == x86 ]] && merge_configs+=(
+
"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
+ )
+
+ kernel-build_merge_configs "${merge_configs[@]}"
+}
