commit:     4cd83e9c07a9d7edbbdd2a1099f53c3eeaf9666a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 23 12:54:39 2022 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Jul 23 15:16:19 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cd83e9c

sys-kernel/vanilla-kernel: Bump to 5.18.14

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-5.18.14.ebuild   | 134 +++++++++++++++++++++
 2 files changed, 136 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index 12d0cde781f3..93f89633252f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -45,6 +45,8 @@ DIST linux-5.18.12.tar.sign 991 BLAKE2B 
8fcdbdd14f841aa43856b2b9f52714411ca7eab5
 DIST linux-5.18.12.tar.xz 129857044 BLAKE2B 
000df730f6651173292a43745edd615b501d959f4d963a11df600a6bcb378db0750023c9025c8d63091658d7540693cc0e486f3bae3b49610135ca34f0b8edd4
 SHA512 
d414299f5d7286c2fad903e54375dafe08a63110ae4c758138e11b71b2269effa9d8247711c17858eda73a9a389ee7fa66736b0fd93e8ef4fa8f8d2fd7017623
 DIST linux-5.18.13.tar.sign 991 BLAKE2B 
24d2de0e73e9cd235f58f2ae4c7008cb6d5868f55c62ca7901bcc1aa692fbb336df730e212910d6bd76d2e8e98c59ce4a5793a26968ea162cae3bfdef02737aa
 SHA512 
b547e241db4a68c946cb23ad1b30446d12298422525b5b96d533c9d62157c48e7933f5aa646b80d25f22f2a1f0313b1075fd51ac37005c381f8878c9bb5f917c
 DIST linux-5.18.13.tar.xz 129828032 BLAKE2B 
bd365ff9a669ff17aeb06a9e227b1d2adfeb65e59c31edc78fa44f4522c9943071aea3f62058cf0f68d509f6d847ff98a469793f107a92ad069d5c6b81f13594
 SHA512 
f78eacc594db7f27941b0ddf5d4995890f7372ee3bd7ad377c29d263f1e61e5b73c43f7350eb26b0de746204f79e64d08f7622c1441ad98984458ea4d668e13d
+DIST linux-5.18.14.tar.sign 991 BLAKE2B 
64bed04a35908e72950298e37ed4d200acafbd04759177260058590264eedccf5f4be97a3f7669226354556592412306c9a9c3ab9f9edf40781bff8132c321ec
 SHA512 
7a15da22d83b176e18ba217a5d078dc46dcb5b99bd2c1e0e2e9f32f8c9ecaf4d8c57c0cdf2550848b67d1c5a0e1cd9fde4a22418630cb90e6b820e346edf2c97
+DIST linux-5.18.14.tar.xz 129850900 BLAKE2B 
faeadb397c61f3adc70fb03d5ba10c203764d8a43b70cb70838d17780922bf05cd8389c19ba8d323f322d81169d11cf744d86103011c4a17606a2081e18a906f
 SHA512 
270c27efc9557c001314dd80508d533e00c1f5dc6be496e1c4581144e2386550efd42048293f178816a01be1c18dc70ee99eeca5d0deed5dd64f4f8baf90a146
 DIST linux-5.18.9.tar.sign 989 BLAKE2B 
f763fcc33c0cdc17835596b89f3589aa23c2e42f9569a31ce359595c45f558fdd79b04a29a3165a18271d23b2f7bd2388b589ae147c9395b46bc18271844d5d9
 SHA512 
c9928fb16009c3c61c19a9d0d3821496bc642c521bfbe942e9769a5f7b85eac1546f7db1878741f4e47875ace99732342ac75e39985003301fd405757f820abd
 DIST linux-5.18.9.tar.xz 129826700 BLAKE2B 
9daa0be3f6f528aa4d761db357448c007f2647530940a12688b7b8b769a605d64b5ccacf0215759fff3383e8a9a179658e4e272bd4747c51663e120e0e12287d
 SHA512 
8db3c73c91cc3cabcf24224bed97a790c562d28cd6a6562b924e7c07cc671d3721d7210defd5c9cc4bddfc16afee0086dacc40397823ca3ccb890f2f938f5814
 DIST linux-5.4.203.tar.sign 991 BLAKE2B 
4e13305b908e1e158c61ae0667186cfd42e7dac237624cc871f584efc68c53d5de3a90379e801f5e26655293c584ab84e16c5f87d503c1e5381b6b9e8634d8d4
 SHA512 
867b1ac576df3db177f8c684291aed7a2094405a8c9f18c49c2f5f1e4c68b6fe4dbd211d65cdeb07db3522a6f485c03ce4993c687c0d93d85dd8af31b60fdb4f

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.14.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.14.ebuild
new file mode 100644
index 000000000000..facbe03b0e1b
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.18.14.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/mgorny/fedora-kernel-config-for-gentoo
+CONFIG_VER=5.18.9-gentoo
+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://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/mgorny/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+                       -> kernel-i686-fedora.config.${CONFIG_VER}
+       )
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+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
+
+       local biendian=false
+
+       # prepare the default config
+       case ${ARCH} in
+               amd64)
+                       cp 
"${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+                       ;;
+               arm)
+                       return
+                       ;;
+               arm64)
+                       cp 
"${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               hppa)
+                       return
+                       ;;
+               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-fedora.config.${CONFIG_VER}" .config || die
+                       biendian=true
+                       ;;
+               x86)
+                       cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" 
.config || die
+                       ;;
+               *)
+                       die "Unsupported arch ${ARCH}"
+                       ;;
+       esac
+
+       local myversion="-dist"
+       use hardened && myversion+="-hardened"
+       echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || 
die
+       local 
dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+       local merge_configs=(
+               "${T}"/version.config
+               "${dist_conf_path}"/base.config
+       )
+       use debug || merge_configs+=(
+               "${dist_conf_path}"/no-debug.config
+       )
+       if use hardened; then
+               merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+               tc-is-gcc && merge_configs+=( 
"${dist_conf_path}"/hardened-gcc-plugins.config )
+
+               if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+                       merge_configs+=( 
"${dist_conf_path}/hardened-${ARCH}.config" )
+               fi
+       fi
+
+       # this covers ppc64 and aarch64_be only for now
+       if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+               merge_configs+=( "${dist_conf_path}/big-endian.config" )
+       fi
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to