commit: 7188b07a827678cca3d7095053a6fe65e1efa828
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 20 18:19:10 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 20 20:47:05 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7188b07a
sys-kernel/vanilla-kernel: Bump to 5.4.134
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.4.134.ebuild | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 4fb7fc99ea8..a6fcda4cc2f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -40,3 +40,5 @@ DIST linux-5.4.132.tar.sign 991 BLAKE2B
82af107e50984e97cc4f633f72fdfe9969633d7a
DIST linux-5.4.132.tar.xz 109135532 BLAKE2B
7899934f816fdb7f8b9ba14a93da39fc90cbbc6be36b6bdede5031df2e8ca0e1d5bb469341c5d86d8197f889d8afc6152bef4fd71053f128393215be48b01239
SHA512
5d63778b2dc0fb7d288ffd357c38beafad062d1eef0a29ddec3e8b3eeaea6f52af06b4fd0af1dd2138fe1264e54f53042ca9397202932da58bc4cd10787fdbfc
DIST linux-5.4.133.tar.sign 991 BLAKE2B
465420bf7480bb2af81050528dc89ec28a1649599a6851446700b37d2c1298cead6fc2f57e45284aee650e680c125b7027366b464412f6752ac10d6f23f0c304
SHA512
0656aab0636842de5fe17da549d4e913a8c30249ecd0a91dada1324b63fe02256cae7f9db2395a6d6585aecb973786ae05944a6b2a64f645cf83db650a0dadf7
DIST linux-5.4.133.tar.xz 109126692 BLAKE2B
60bf36af720517bc4177147700d2969171dd270394bdf9ab3f6a38ad58a4d5eaf5e4d044aec572a0636221a61e6ffea7a9c9c55d0a61704361099ee0b335d34b
SHA512
710fea602c86283d5018f2140a9667c3e65f926ad4643d5519cf70b4f471262c52de3fd9f7a52dc1de2da16772f6f2b568281bb9bccd932a2123397137db334a
+DIST linux-5.4.134.tar.sign 991 BLAKE2B
d5b705ecf03edfac4274ee6a3d8930e1e022d8e19970822822ac7e75d0ec97a3d50d1c3f2057ecbcd12fd8078a00a314bb8991c4f043ca5cb1db94c53a3264e7
SHA512
cb312e065218605520c8e445032bfde209cb941945947988369e6fdb9900c6843aefd03dcb3c913f8b7a59ad588b7dcea86ccae1aae29566579a19285f4a84a6
+DIST linux-5.4.134.tar.xz 109136880 BLAKE2B
c9bfcfdbd6e30fc265cbc16eec5f0014acf8c63cf8271d6a436c1da5126013fbb2b08de2e552707203cc50e8991d9aa78ca8cc7ed67ddf20e3d2d08b825a4659
SHA512
7b5faa3f1c64d2b270f93416b5031407aa3181ee8029f3a576c8f09ac034fd0771f362068c41bbbb546d14b1d389042e8cb940f493d2ff9e3e4173cba1633c93
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.ebuild
new file mode 100644
index 00000000000..dc33930084a
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.134.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[@]}"
+}