commit: 684c51cca04f86d19d9c381bf571616ece0abcda
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 15 06:34:30 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Apr 15 09:03:23 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=684c51cc
sys-kernel/vanilla-kernel: Bump to 5.4.112
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.4.112.ebuild | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index d31eed8108d..9587b7f35fb 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -58,3 +58,5 @@ DIST linux-5.4.110.tar.sign 991 BLAKE2B
7b867b443b04df37f66edb0b8b6a545515790512
DIST linux-5.4.110.tar.xz 109093812 BLAKE2B
41664c20aca4a53e94aa7fa475e10284a37bd81d823ae48e7179fe8cbe3dc1ab603c4d162b1335abd0d51d8eb830633d724a4ca8763b494aca41b0ee06895579
SHA512
5b9c2c62d26e24c248a6dbda7607e8a27d6f0d9e969a784efe3e42808c5d89794c61146c1c75728b18274414a0f54c295cd5852581235d324712df01cf6896d0
DIST linux-5.4.111.tar.sign 991 BLAKE2B
00ea726e62ca8810210ad3be33b40f46cfcd3daeab510b0b16f4788c37e576a0018ddc1e2a280c32a3a574fa89bd929af25d7516efe5eead7dc90bd9c55da199
SHA512
185804fd5afc9cea54911d0228b79860a484d2c45c65e68545944d5818397f735352f0525506685b2f7671de669db3ad6ea5b3ca1f873e8b79b1641eeed7c848
DIST linux-5.4.111.tar.xz 109087996 BLAKE2B
843f9a6a8413c2d8a2b0f32de704421ebf9200793c5413c51b7ee812fb19a58f79fee90e26b6fa946899487644e4558aff033009f4bba2f229e914542c759662
SHA512
ef17ac3a47e3d2189cea60310fda30d48b2505c399f9f23ec8be2f2787fdd404c8616eec8382bb9398de3e64d5771dd09a942a102796385634af4ba2bbc5f488
+DIST linux-5.4.112.tar.sign 991 BLAKE2B
7f06eb8b2acf5b0529e60d7d6a09a6337c70378468368e552bac5dd59e2f5ed4c3e95f702d2a955055c1fb2dca13658fd91cb30e9303c0cf71c33b6bb9f5fc1e
SHA512
af0b615ba78d8c7692061bdbdf7d0cb179917e5d608716ad962e83b528c3f973b7a4d1b85f360ce6295e5ec225232e8c2afd3e43bb0b91dd1b216db33251a867
+DIST linux-5.4.112.tar.xz 109098024 BLAKE2B
c8a50b84ba2fea5b1efa6643634042ac60d19b4acb2996e914df99bbddb91a90e772cf8c7a3e38963f1ac2547363c7b203dd1b0ede1571f9e4e685d7e79d419b
SHA512
364550a20f91caca3b6f754fba00aee940b20305e9e880899633cef26a5f4ac3641b8817f4ccb615ab084551f4616654bee70558354bb66c924d1e989c8b5db4
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.112.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.112.ebuild
new file mode 100644
index 00000000000..0a544ed3617
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.112.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2021 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.89
+
+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 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/dwarves )
+ verify-sig? ( app-crypt/openpgp-keys-kernel )"
+PDEPEND="
+ >=virtual/dist-kernel-${PV}"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+pkg_pretend() {
+ ewarn "Starting with 5.4.52, Distribution Kernels are switching from
Arch"
+ ewarn "Linux configs to Fedora. Please keep a backup kernel just in
case."
+
+ kernel-install_pkg_pretend
+}
+
+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
+ ;;
+ 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[@]}"
+}
