commit:     b2d148c976170dae7d37381317612dc98f60b29c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 17:08:05 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 21:17:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b2d148c9

sys-kernel/vanilla-kernel: Bump to 5.4.128

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 86e407566fc..0fc1df034fe 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -36,3 +36,5 @@ DIST linux-5.4.126.tar.sign 991 BLAKE2B 
c77a7cd7ca08f66cb83c1036b4effd8e20ef6e49
 DIST linux-5.4.126.tar.xz 109116396 BLAKE2B 
620d9e68ef32dbe8ed88800e251a76b77826ed24a7f333fe62dcc7182643016ad348aea289acfdd3f0cb9a5325682453160afd2f377a8e1809fd19b38187519e
 SHA512 
1139726aa6a421c529894a6b657f3d1c54ac5df5f277b453d4726e80e93d3298d53f878b6f7ba98bf38754b9a4438f378c9581a8db588766f27c3e6e5d4a9b44
 DIST linux-5.4.127.tar.sign 991 BLAKE2B 
7942bf63d20cac4e56d258585cf3d4d9508e7e6aad9328a65b0971acb8aa5200f031f4a7225d01eb80e17a0a40a908e6dcf49dec251f59b5bfa16cda3e67d3fa
 SHA512 
ed6e9c01b277391cb1455154bab0baf20b7b8c4eb44761eb4fbc4a01027417ad4dcda0a2a737876a321b86eb92011cac08dfc92e4e08d3c19f65a1cfed5513a1
 DIST linux-5.4.127.tar.xz 109118628 BLAKE2B 
a7b890d06f3eb0a734d1f4b76adb3e4bf28a9ce7c65eea1c2bc31bfef44bb7960cfffcff5765b640a5ddb6da96e97a1fb0f644eaffe44b33103983723077e18e
 SHA512 
7f3cdbc82ea3b75a3d3a1cfc2cf459fb2d8a8d8b14ec772fcf6a8ab6a394d66ab796f641efb2bcb907bdb89111e9089c1b6c80d47ceccaa5502aa872fd1393ad
+DIST linux-5.4.128.tar.sign 991 BLAKE2B 
65e2027513dc5527ce90f36b9ef313701cee499c83d03f140b337d6a30a74f1f8fb4a286737514ed34ed310f791ee58138b2adb5216f202bad051b7fbd0ffcf8
 SHA512 
42df2576670874e3bdc392db6664460bd5a5a819d6f0234f8092c9818580afd1e2185fe8ccd4e84516063459e49c33e609e9e9a69ad616db8caf5fa8bf57f199
+DIST linux-5.4.128.tar.xz 109120108 BLAKE2B 
bbc701f3b470ea629f199c2cbf62652bf717c5067e172286f619b4a62c662ce7bfbe4b54ce99098b726af7526e7eee38572f0c51309b63bef3ef0f4f997a5298
 SHA512 
28c259cca5be2c618d8b03cd25bb342290e3902544687fc4af201e1df666ef96ee6ca02546e93e62f42661ba1076f745f47652b42d5c036176a2b51af024e914

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