commit: c3dca801c1e59f48e40b52c1f4ba0fbbe52e5333
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 12 12:59:59 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 12 17:04:07 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3dca801
sys-kernel/vanilla-kernel: Bump to 5.4.140
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.4.140.ebuild | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index c4653262c2f..30dcf9262bb 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -63,3 +63,5 @@ DIST linux-5.4.138.tar.sign 991 BLAKE2B
62d2861c79afb866096a938d7d92da5f1dd9891c
DIST linux-5.4.138.tar.xz 109142300 BLAKE2B
c3cd90a3a3d4157db8be479afa28222d1ff17f663ad1ef36d10534b86a6dedd7057a33fe3a10023d0a2aefa4aeb3da9b2d3d8a0a1fa07f10ff66c30737f6b680
SHA512
2e63e4e83b0c5d2a16b10a56cf81f4387c03c918a856314f886b12fc1d71d3fe7a4067fb6028c8cc057b9e2aa0ab7c2e44da446fb459ee5beae4bd0a019abb87
DIST linux-5.4.139.tar.sign 991 BLAKE2B
9ecb1c5f49b22496e29bf68edd761079cc0bbbff141aa9a8118714e5107df4bbe9422d08e62668be56f9731e7ea05c500d88778d5dbbec03bcbd798b73c95f62
SHA512
06be8ea79375b2cc0326d5534e7ca4233b2ad1cfd6eca63a839e3d514678b571a39e7716848e3c2d7d61a37ef1d0b2ff2b9bcc52220e03afc38b28b29c170a35
DIST linux-5.4.139.tar.xz 109142932 BLAKE2B
b8b1102d29caf312431dcc52c45aa70205fbe708af722eaec7b37331401d62e4906478f33e2fcc4b0ec88369dabb123f4267d114083739d6a8b7e509455b2e1e
SHA512
d68cf5e60f309f1eadce232d71954e6271b9152fb42f2e6e7c01b47896cb2d1aaaa5078604da4d7c0775a9fe0d7ec366dfa9b6cace1b0d657bac14ed95c77208
+DIST linux-5.4.140.tar.sign 991 BLAKE2B
b47a512a34f37b79344cf35e1f7fe83d075877e96697c7927f0c3e9bcca4a718825a3de5029122f183ca8b6aaa948aa18165e7fe116df3c6d096011b9011dc8b
SHA512
575dcb2734bcbf690a5f557c8a87fd404e897379bd06e098bebec4daa07189946fe49fe0c51413b93a4da661596bfd38fffc43b6512fc27c75123cdb34437ff2
+DIST linux-5.4.140.tar.xz 109150880 BLAKE2B
6bfcae668b3fdbef446c3154bc06422de01c7a6abba7da2c2baa32cd10dfa155cffd73d45234daf454e720e2e29fc0f75cf590d8e7cbdaa4fce6aa7ce021b135
SHA512
da96ab701bed678009e437fe8533ec3196b049c9998c2b07538610fb5e7e4ece5d907f8769d5677c3df772c9015710d113af3efbf661eafb5d3559b8252a06a6
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.140.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.140.ebuild
new file mode 100644
index 00000000000..dc33930084a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.140.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.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 ~x86"
+IUSE="debug"
+
+RDEPEND="
+ !sys-kernel/vanilla-kernel-bin:${SLOT}"
+BDEPEND="
+ debug? ( dev-util/pahole )
+ 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[@]}"
+}
