commit: 206f29720435599f77d1f4385c1a9c74bc4850b3
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 28 14:47:54 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jul 28 18:13:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=206f2972
sys-kernel/vanilla-kernel: Bump to 5.4.136
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.4.136.ebuild | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 290a80817a5..90364be7b3d 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -31,3 +31,5 @@ DIST linux-5.4.134.tar.sign 991 BLAKE2B
d5b705ecf03edfac4274ee6a3d8930e1e022d8e1
DIST linux-5.4.134.tar.xz 109136880 BLAKE2B
c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659
SHA512
7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
DIST linux-5.4.135.tar.sign 991 BLAKE2B
0d64c3b0390b34a42ef4cd60df2f6e5c0ef2eff8e492ece562f301800bd2606042370bab40f5a9edac29a905edf74e9ab5a487ba2dd33a2a84704bd4978939c0
SHA512
95d2689a9297c2214f42b9e94f644e117958baa4bfcd9a2d47b4c80fabe56d1475522dd07471dd35efd72baa4d40a4afdb573c1b06f9e8957bbca2a805c9920b
DIST linux-5.4.135.tar.xz 109142888 BLAKE2B
9324033cd44ba1413d03cdb4e067c3c9ea2c92f62dd0d461f3d3737a9f4c14e4966b403f4381093f7dd1c943ab64b2a14b8959a96fff64a736763191fbb08ad3
SHA512
cd0ac932a7ba43ab827f7904d14f9bd7b6450f7a2e42999ae8c6ea44cdda830eebc1cd2e692c7c4c94ebb8d95fe40f0da309fc9587d1554e8115941f4834d9d5
+DIST linux-5.4.136.tar.sign 991 BLAKE2B
b00eae0e8f6425c148f7be9d613c8c420c2bc0c9836f7c2a9c1afb844771355cbb35d37e02cdad68462bf671646ae5313ac0cb4759666c7cb27e2460855dcdab
SHA512
15dc64e218f71d13a2833339de3ac7a873342b098f655afea3f25c7aec05f4c80673c2c39f3c914e4aa22079a4592b34af0dbbcd83a575dd9345749b39d466e7
+DIST linux-5.4.136.tar.xz 109141428 BLAKE2B
f9f60af9b63b5abf91057b0160ff9f75b33c587b48f1bf7c8be99e8b6a3ea4c7399bff0f004d054de5631b9a1b44c330a04262647b2ea52c03e78eec237385f4
SHA512
c539deadf9dd44647bef81a5da5efcac1f0b22de473bca87a9f2586f23c47403c210a6d3bdf1f20d77bfc48d2d3ebd72471e7cd2b437e2379bcb17895a9c4a60
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.136.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.136.ebuild
new file mode 100644
index 00000000000..dc33930084a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.136.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[@]}"
+}
