commit:     57a4d71a05f297da1b243e0e8b7d24e638a59d64
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Dec  8 14:17:00 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Dec  8 20:24:02 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57a4d71a

sys-kernel/vanilla-kernel: Bump to 5.4.226

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

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

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index d5d8d51c0870..182a3c5a0449 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -46,6 +46,8 @@ DIST linux-5.4.224.tar.sign 991 BLAKE2B 
dc31a065cb747f537923a743d84a473e37244131
 DIST linux-5.4.224.tar.xz 112963056 BLAKE2B 
8fb9e729fb6642c5824b32f28cbdcc774d1dd0c1240dac4644aa7030a6171f4f4795e92eef6aeb03f4e92acd26a4ac8fd785ed76610ef63c83a61067b7264427
 SHA512 
fc54140a20eace0d2191b2ce99415459c16877440a37d101cf628fd92f224536d1f5fbb1f3d2ccb07204df577aea06c913ffcef974690cb93c768991a8bf160b
 DIST linux-5.4.225.tar.sign 991 BLAKE2B 
7979abcf47899c61a9a661d73bcb07b097507e3e2ad41aecb8385e445fe64e2d59053b9fb5f9a1db43f4c1104bb05c860a9522b89db5bb4b811983dfd93bc75e
 SHA512 
5096ae43b0773d3ea80637b8c5a5816ddf45f4d48af9bcd5970e2ed3543c678a1db5232834107fb308f2043ab0d5a7684ffe19807900e3d3e0de9d50f63d8365
 DIST linux-5.4.225.tar.xz 112975708 BLAKE2B 
1fcc64d4a71f4c1b9ae282fabd37a542f53b78b023cedf657a9649b5a1091b27677acee778c28b7919dfb634e4e2494f868ba7ceced2ae4fc5f3d901b9b02b2a
 SHA512 
2519e9ca893014253e7af9e1e99168693c50c2c39a819a65105dc70f5ad6906d9348a61009c0575ffccc625b7df49c6e1c51bd141bf7b9f64c4ad9f5a173ed4c
+DIST linux-5.4.226.tar.sign 991 BLAKE2B 
8e8885dd031f30549404f8505e3b47488f72299548d1a95a9dddf6a0f45b2ab8a91cc5f31d76a183fd389137d508a2122b9a39c70d1fcaadfa21a657174aacc4
 SHA512 
900386c2ceac16626a6db046d50c5e41f49b8628629b3a5fdd5dde6796727fe6bb14cf32aeb1b9ccc8517496d59707660ea932285b2d7cd2f16752c1aa9ba951
+DIST linux-5.4.226.tar.xz 112965036 BLAKE2B 
abbeb307ba8dff0b05730a70908d531b3e3521793b598cc7432a4d98f6e2ea7a26038612dd2a19a7712c9dd36b5b6ff8cf5f2f1ffee21a7720a371254cf98a45
 SHA512 
154c11c58465985e5c68821c4483130c7fe4213fb2dfb4874ffe9d179ccdc9673a04f11d9596116f6105b3dcaa56da9f4305454cdd863b3ded5e24ef6948370d
 DIST linux-6.0.10.tar.sign 989 BLAKE2B 
b61afc42b98f495da3e93ad800a8256fa330c5538e52a68ef4bcab382e3a0dc423e89024b2840e7063857f3db82ceaa06ec21d84f8efc51c65c1090e12de7a9c
 SHA512 
90a8d3cec46b748eac6113e338fd26f19d2e4851487361ab38fe2d6a6abd0f6afc8db18d913a0978a774f26297cad944fd5f0dbca9a176462a2995742b7d76a1
 DIST linux-6.0.10.tar.xz 133913388 BLAKE2B 
f061e3f871e5925bbe8f829c1dd7cac72afcb59fa2fc76226268c32eb990c8637b7dadf56c9f9608f0828debf8a7af519b7f1aa2a37e82d64b97f4f95bbd3f76
 SHA512 
f25b2a778be1f0879b152ce01d33c344e6fcb670b48d85d6d287a2d3b244fd248b0b775639cf8101c166adb19f8daccaf0e88815b5efefb6355ff2741a1888ef
 DIST linux-6.0.11.tar.sign 989 BLAKE2B 
75e55b5b6162d02b6fa34e16bc7997aa39c12a8171f1ac7e309aa143fb2747c85672f7785c8b09c262f0302477655735e98f6dd4a6536cd044ede0e3c3101b2d
 SHA512 
7af082a265cb4cbd78ea91275223f934787600e56be25f74f356831ef750751181e76d3e0dafdf608872fdf3cc86e0d01e8417d4cb0e756cec724bfb2ddb8a79

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.226.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.226.ebuild
new file mode 100644
index 000000000000..ae90752d5ab5
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.226.ebuild
@@ -0,0 +1,108 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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/projg2/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