commit: ccf8420e8660fa3df58248c9dc44d9189260ab0d
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 9 13:44:10 2021 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Mar 9 16:25:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf8420e
sys-kernel/vanilla-kernel: Bump to 5.4.104
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-5.4.104.ebuild | 108 +++++++++++++++++++++
2 files changed, 110 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index 8b9459b3332..4141ff78d17 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -37,6 +37,8 @@ DIST linux-5.4.102.tar.sign 991 BLAKE2B
5a839b6415817715eae350f2c7e8f1b8711c41a1
DIST linux-5.4.102.tar.xz 109080872 BLAKE2B
bb4a627999ce6ecea5a8cea0fdaac5b3443c9168a381b0ae8c86b1a07554cdfe0e0b395246398f21f082f153602335b1768fe060ddff4c3a83c4ee040ee708a3
SHA512
385a075e2d68d9d90c77183d743766fe5f6d9a279e8e4e73aeb916adae0fd17fc533cd944c14c5cd289e025f880dcb45211dac0ab7fc227afde4f8b7afd5689e
DIST linux-5.4.103.tar.sign 991 BLAKE2B
4ee52466520a2dd90245cf6fb2b753242b6c488fdf9df42aaa532b46913d893ebd3ef518d45ad1764ca4e474339ba7367df2cd6cbde1abc10c0ea66bd4406eb7
SHA512
306f48f329b8cb1fe172b3c7e35bba13c5b572db66e99290d57a75d725b71c8a386b66645e1c66217beed248aea1fa70989a3570b59d2b189fddee46e6e3d7a7
DIST linux-5.4.103.tar.xz 109083324 BLAKE2B
36c458ea80b2d719688782df72d89f4e6a947a84addf12e2907b09e33e9407433c2fec786b412749299312b790565de974d96c1c3166e6874bd9f372e048a45c
SHA512
c7faac148744e0c31e5665f06a7c67afd8b1e05cdfb964fd0e0e0e4796560f107f301d9be9df6abcae7275d21af27c85955ad3aab0718545be56a0d26de83187
+DIST linux-5.4.104.tar.sign 991 BLAKE2B
86d63b75caecb65842bb2685b5ed586fbfc104ffc380a508fa01d4dee3d200f782fc57d46263b7ba884e9d94f5298d1863796970a65dfbbcca3edb27839f0257
SHA512
465fbc0ff1c9fc609b0a9eb86ac0b37551c7fd084ddcb8ec7772b255220ca7b7502b102f924ef1ab32d9a253812f23de48b253db5ee1cebc56625ba0d8204ce6
+DIST linux-5.4.104.tar.xz 109085768 BLAKE2B
2b648464a2d36d60511966b9a3672768139d8e16373b7218f637aef558ee88825a0e582e44f9bef3333c7427169f1662296f494e6cebe0bb01aaba8e3804e918
SHA512
3bbe5e8c2142e52b124eb3fbda91516ac6e7d8b08eabd96a5660b00bb1cddcb80c1bc0f8d807681de58f6b0a986d1ac340066d37b0a92e612c700ae988aeeb2d
DIST linux-5.4.94.tar.sign 989 BLAKE2B
779a725d0164c98bf2ebc0590af693eebb6fe71837e0f8642b376fb0fa4bc893e8c2b52a16bd0c1cab7aaff4295f6bf31b8fdb7c2d95bd8601eac74925e2211f
SHA512
85ec9c16642aac5640d0486ba704b787e2e4156fccdf80f4d538b4d6524c914b64e6ba1d52bdda15b3601faec643d6656fa2cf57976a9afaff5265f9dea840e0
DIST linux-5.4.94.tar.xz 109082512 BLAKE2B
fac6683453e41065760cbdd170ea4a5f72778e39807389d2f4c4dd9165dc1727a875ee26e6e440089ec2d8e8b4dca9fa1e1dc02a9b217cada700f9a118ae7613
SHA512
2d9f0feeb9ba6871d31c8a5e281c8e3eed99ce7da3af3be4f222db37f082374f852021a5117a994c8cc37681e5f335329c9e430e7edb835de801c901765a505b
DIST linux-5.4.97.tar.sign 989 BLAKE2B
767058a0c491aa1435d5dcd25d5f26ed1dd283cbb903063d00020e2a5e7a2a965b7774df3fe4e5484bb1c76e906e9622057f60420d9dfe31a5305d85b15e2d1e
SHA512
09fc4efaf777d12cfeb61e7d24651ca68461c108666be90bf216ee5586cabf47976d60451f8cbdb636ff3f3a4b66b84edfc0255b26d3589f918c22aa394dd76a
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.104.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.104.ebuild
new file mode 100644
index 00000000000..0a544ed3617
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.104.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.89
+
+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/dwarves )
+ 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[@]}"
+}
