commit:     463bb9d803ad5ad0fa95ee14d8b6702bc2ebe389
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 19 17:33:12 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 19 18:49:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=463bb9d8

sys-kernel/vanilla-kernel: Bump to 5.4.186

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 5d93cef2eae5..d5eda8c6fe66 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -59,3 +59,5 @@ DIST linux-5.4.184.tar.sign 991 BLAKE2B 
e9eb40f2c9e9903cbd79353ec82abb1ce5600f58
 DIST linux-5.4.184.tar.xz 112917548 BLAKE2B 
eb623f5367bdd5ad6d4bb8b6cbfb15baa54c9769e811315d463247359a53df6976c47df923365b5199bfaf3b7b5c47a04a745954e3c52186795de07243742a6b
 SHA512 
83b203e57ea7f18d35197bf6592b8957bd382beb78c44cc5de05c30e80ce5ab02d90ac6d1415a785764bcf1b7ee4743f3b773927791ad78524667562fb216c36
 DIST linux-5.4.185.tar.sign 991 BLAKE2B 
5508bfda73f95b84314ebb907181befe43615af569a15aa7fa01a27ba8ebcf60453ca4082e3a5c405d76bc0f5ae9616977237fae620152d41911e47de32797f7
 SHA512 
9004a8d3a414119e9c482e1dfbb4bc775977986b311aadd4f4c59d2acf10d0721c8110cae59eb48428e9d12dda6903d27d30f2bfc766a52e267f1a2c66573069
 DIST linux-5.4.185.tar.xz 112889592 BLAKE2B 
f44cf6b306b254533f15dff3820bf014937fcec88c75468da84b4eb403cbe1fa5ca5a830ee5f73fb3c57b7af1510cb6a7ede531836e6599c5b044e353fa11b3c
 SHA512 
491faf373500757f77e26e4cb402b51bc79ef220ac90579b02fa2cd25f7e524873fe4b5f971a71d41d198baed9905154c21b70c0387c2ba2285d3f1da730e6f7
+DIST linux-5.4.186.tar.sign 991 BLAKE2B 
6272e71e1e9b34590c73eeabdba16f1224405617fd9a57fa94090c2d697f51499c6e77424616dc043c37c0e68a519c736396394b97d4f93b519b1fe9f22e6a0e
 SHA512 
d69a8c97815396fc01e24930df2c39db17894cd52081967de98d9179856253db8a20b86cb172cf1120d6d157d5a7258d9a192687da60614fef7c3fed49f96b8d
+DIST linux-5.4.186.tar.xz 112884120 BLAKE2B 
30b48c13ef072dbc8a5886a23450212a436aec236bf7c01cd119fe7d6f12f31d3b1296930aaac641a7545d2d1b925bb571d483c85718b4a537b828d39d29932b
 SHA512 
cebe4a5b2b45c77b96bda61f04db563fd9fded503eb057db748329b39c541ff8ca9d49f6a04d40c413b0cdf9917a666d5cabeb4011760229aad794f41c300543

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