commit:     c234898e5d3b6de85bc75bfbeb35e5bdc98b0b82
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Sep  2 14:15:26 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Sep  2 17:34:36 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c234898e

sys-kernel/vanilla-kernel: Bump to 6.4.14

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.4.14.ebuild    | 138 +++++++++++++++++++++
 2 files changed, 140 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index a7d7524dff9e..e514b22e575e 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -58,3 +58,5 @@ DIST linux-6.4.12.tar.sign 989 BLAKE2B 
598b2dd8b0beb25db5b0500547bfcf7ea669c06ff
 DIST linux-6.4.12.tar.xz 137846568 BLAKE2B 
0d8b6e447a7fe390b44967ab8dc2e116de29b6fac15a91fe8398d091f5803984495dea595d53938e75f0213b5268bbdb63a86284463552c8e59ffb02cb98ce17
 SHA512 
6758994ac1f8bdec1848d9c90e7f66847512567e5de71fdcdde42487043ff83ea4745f9a2e2631046faff3c5d74a69e9413fdd78126f881cefd05e9efc652cd6
 DIST linux-6.4.13.tar.sign 989 BLAKE2B 
0f23b79cf7d79941153ecc80162bcfae63eb1215b0bf45e13f47614d0c39f13c4aee2bb98fd84e6f274e4631d9c4555bbc413477ce192151d9d0298df9092022
 SHA512 
318c1bdc13fb70544a235263c3e69342129449e0efe035d2f9e5a99ac3787ac00cff42cb007b2af1f7e8129d159e90827d9be0c4432712dc352969a40a44d9ec
 DIST linux-6.4.13.tar.xz 137872836 BLAKE2B 
40aa951a92913116264013c6bc170c6663e6c709560596c48dece69a0fed6b4d7a44aa3fdc49dfa7ccdf9483b334be4575fc74bc38d1f2c0dbfe00748c4b29e9
 SHA512 
259436a9e6262bd4c2ff91f769f76259c2b85706dc9cd7c6d38d32c334efc1c425754ffe8f1c01820cccbf6ec25bf6f3c7ce4ad8f66de50e01bb1757adbdd3d4
+DIST linux-6.4.14.tar.sign 989 BLAKE2B 
6f819ab7ec6bca5ffc4ce7cba7ca73206edfd0680f407ef18022ef5467469f5c819384c318d53bf78ce5068f55e4ec85e5698b7615c03daeca1f900bf55cace0
 SHA512 
3933d45f8cf4541d4f2e055d5c58ab526377dd5c65e35b4f4df804709a82198ef613cd8e4e41bd8cdf986f601cee390d86908e155606d260bc2ae7bb4ee7e02d
+DIST linux-6.4.14.tar.xz 137851916 BLAKE2B 
f81dabaef7e31b743aeb75d0dbb0a337e747d1d743fb0b38cb314498200d8d459d82f5f8bb34d6ad688842f3617fd53fd35b1b518654c845a6781580531ab1b2
 SHA512 
793804275fc8b11f3610951458f31044a7554a8f3e842f00dd9dd70c00f76c0ecc7f670f5824ce153173ca91105f6284a047f251cc198ea61643e7701f16e427

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.4.14.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.4.14.ebuild
new file mode 100644
index 000000000000..ff7ca5f6894f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.4.14.ebuild
@@ -0,0 +1,138 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+KERNEL_IUSE_MODULES_SIGN=1
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.4.12-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+       https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+       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://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+                       -> kernel-x86_64-fedora.config.${CONFIG_VER}
+       )
+       arm64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+                       -> kernel-aarch64-fedora.config.${CONFIG_VER}
+       )
+       ppc64? (
+               
https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+                       -> kernel-ppc64le-fedora.config.${CONFIG_VER}
+       )
+       x86? (
+               
https://raw.githubusercontent.com/projg2/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