commit:     dcfbeadba05559220de9a493ff9e5f3bd441f580
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 05:13:54 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 14:13:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcfbeadb

sys-kernel/vanilla-kernel: Bump to 5.4.198

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 2667296da483..d6e6ec0f661a 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -55,3 +55,5 @@ DIST linux-5.4.196.tar.sign 991 BLAKE2B 
8da70a3f1f7a4bd7e9a312146bf891c160625126
 DIST linux-5.4.196.tar.xz 112910488 BLAKE2B 
89262970ae146b9c8882a816c8e619072a42912f0cc51df6ad892c383672682cc852cd441e0f0ba7fb0735317aa1e4906a4337dcce4a19a5c34ffeafba139c41
 SHA512 
d3b5393e929c5686b394bf66b21e92baa82999185259e198c2cb8a49a257d36268468c30a513ec00b08bf1fa885772ea149dd3e67c4e6c1474097735ea074b0a
 DIST linux-5.4.197.tar.sign 991 BLAKE2B 
ff5725d1239341586fb62ef1d125523c3189a896b137b531b817512ce54c25ca5f96b8465720bdf04edbc9cefb814288c571be6835f4d9cbe45e79f801ae1372
 SHA512 
6c450ae5d4b27929599df75b44572e197141765dab6a0dab156dfe01c3c1bddb95185c601199b4e174ae050ff6ec246adb91a3e81078c62bbf887c590a1d666c
 DIST linux-5.4.197.tar.xz 112914028 BLAKE2B 
88607913fb1d37720f904c8709347fcab46c34e72e38dc81ab871dba44a356747e036f522686cafc1805693b0311fc3e721b0811f2868aca7ee8b3d924f05b13
 SHA512 
49d046b21146372d8afd50ca127db49eaddbce1bc5733517b6237833ed0eaa9c3c4267117b4ffc71518a92fd608734ff419d4722a2b99a519f444ba213762150
+DIST linux-5.4.198.tar.sign 991 BLAKE2B 
292190044b014c31d14a177d19539d675f21ffb607bbe855b53d730eed5247f098fb9117f374ff9b151bba511d9a2d33eb171f3e7f39eb7f074cecb8f4839179
 SHA512 
4be8ca05751231bc7efb19781c5f526dfcb36a65fe42afd2297e52576f5049837664d26f25744d07d57f78e0379e04fe52f20685902e04ecc66924abb3d3fe84
+DIST linux-5.4.198.tar.xz 112928328 BLAKE2B 
ac19e2d70ede623236d10b706e8d3d1aedbe8c4f3a7a5a237829eba3f491785fcbe78afbad3e57edd5f448d38756717580d12d2e8b6b7c3f391865826177e32f
 SHA512 
33c72ff8a6b1ab6fc19c2ef58bddc28ce4664d91dd22aa1c83655bda5de7e93b92dd3acc13a136ff55210dc4dcea211056308370d29983bb401770dc701d7a4c

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild
new file mode 100644
index 000000000000..4f5f7870ccb8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.198.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 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=g1
+
+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/${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 ~ppc ~x86"
+IUSE="debug"
+
+BDEPEND="
+       debug? ( dev-util/pahole )
+       verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+       >=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+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
+                       ;;
+               ppc)
+                       # assume powermac/powerbook defconfig
+                       # we still package.use.force savedconfig
+                       cp 
"${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .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