commit:     17c2fd12259525164cdd213e1962a3498b01c5cc
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 16 14:28:33 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Jun 16 19:12:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17c2fd12

sys-kernel/vanilla-kernel: Bump to 5.4.199

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 4b3f337bc95f..b450e1246dca 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -69,3 +69,5 @@ DIST linux-5.4.197.tar.sign 991 BLAKE2B 
ff5725d1239341586fb62ef1d125523c3189a896
 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
+DIST linux-5.4.199.tar.sign 991 BLAKE2B 
546df4e420a5908a653cfb2cbae8d13b6716149868f1e8ebd1c902578c3e81dc8ea8ece91af5488b1c83038e505d84e0e48b360e139e2b4600337fb544338655
 SHA512 
7598d840f9535fa872a610f617b6ed242a3eba9ac15e34d725ef117ee8b19336bbc130222582c201a8e09a4b8afbc206cbf44eaa9907ed5c05f24b537dfee13b
+DIST linux-5.4.199.tar.xz 112902300 BLAKE2B 
c3b509035b3ce660a0bad0d29b7a3c23a2005b990661be9764eece602e2be736a76d8adfc25f13d6ab76e0dca95e8a6ee804952a18763706b425d08e26159a44
 SHA512 
3aca7d71515011acd36d3dddc8d39fa0f08261dbe3555843955f6381a16a7b6a3b90cc3a01b21621d9e0c787f29ac5157ce28aaa3ec6decee0df4581c483ac51

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.199.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.199.ebuild
new file mode 100644
index 000000000000..4f5f7870ccb8
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.199.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