commit:     2926798f39d97e87b04ddb1da985f33dabeee79a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 16 12:30:42 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Sep 16 16:01:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2926798f

sys-kernel/vanilla-kernel: Bump to 5.4.147

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.4.147.ebuild   | 108 +++++++++++++++++++++
 2 files changed, 110 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index fbc30604647..3283e98e4be 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -55,3 +55,5 @@ DIST linux-5.4.145.tar.sign 991 BLAKE2B 
3521095f5523cdea8830f8acda19c1f54a158ecb
 DIST linux-5.4.145.tar.xz 109153364 BLAKE2B 
cc960274d8e81ecee0487f5622de5080d7e4097c104cab439d3aca4cb2bf7a29023e8690572e541c10ddd1aa3b82eaa9672a7416425ad2f3743477884e13330f
 SHA512 
90eb43cb21d8ea653e67838507580603bedfec887015f960fb2ca0a21523932385232ae2849507e8f85a4f9fc5479751f634e6271016525d42ed185defe2afb9
 DIST linux-5.4.146.tar.sign 991 BLAKE2B 
02f30d6bb764f55bb6188df4e76a18a6c1c19a5087e50d7c369c5999ced8f6b56cb7709ca85d2d0e2a97ffece708043520a79b9c02d1ac129b61551bb9373c87
 SHA512 
18590cbd74267b91ff12932c11ca8f0c39d89f695f69499178013a157e049cb1f28b7e521d7524248ea72902e61ba6b36949f4f30b48152027f7110d816e14ec
 DIST linux-5.4.146.tar.xz 109153012 BLAKE2B 
990910051f220c249b2175593129e9343b4052988106955830e96cb42ce8ca6477fbad6a724a80b402a4dc838279a81c5fe2de398510ccb9ccef7761683c0f05
 SHA512 
dad8b4f91ae5e40c24e4f7c92c1ac0846dc1b64c36208b897ab52d7db656d961cc2f53ad038aea0da9955db37b338b9cbcc7acf8f2010e7eed87f69e54dedb40
+DIST linux-5.4.147.tar.sign 991 BLAKE2B 
206a6506e33b6fe04a9c6f9a3cb0f95853cbc8e9bacb03fb34e13d95098786953b198dbe992f39c8ade1df406e83d7c03171843705899fdbd852aa06b22f36b9
 SHA512 
fa30290def75643288607fc842ee4d8ddbdcb35f2a7a00b38e59398558f686d5c9ca2beccd49b6b7a22f1d6c9b67b91386f15f8712af2af558fdaa5b9818d5f8
+DIST linux-5.4.147.tar.xz 109149012 BLAKE2B 
bb0d41ac28c2b02d27eefafa643e7a661ff777c5682d1a47c1cb8df84298e66c866877c18dd8bb4de2e64e72e1cab7fe8409305a48baef90625a96b551cfaa82
 SHA512 
a1dfba5b7b3c6f73bd662132c1a5f90e0a9ea3d59404c2776d260bf9144b7e45429c6758c3c07f2c6e495fad222243418a3ae5dc3a5d5bcdafd9a62356ab1cc9

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.147.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.147.ebuild
new file mode 100644
index 00000000000..dc33930084a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.147.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[@]}"
+}

Reply via email to