commit: b4c979b79cc5da87e9d1b1e603832ed365e32ca4
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 19 13:35:39 2022 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Dec 19 18:39:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c979b7
sys-kernel/vanilla-kernel: Bump to 6.0.14
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>
sys-kernel/vanilla-kernel/Manifest | 2 +
.../vanilla-kernel/vanilla-kernel-6.0.14.ebuild | 134 +++++++++++++++++++++
2 files changed, 136 insertions(+)
diff --git a/sys-kernel/vanilla-kernel/Manifest
b/sys-kernel/vanilla-kernel/Manifest
index c08246a7cbd7..fda0f90d7688 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -62,5 +62,7 @@ DIST linux-6.0.12.tar.sign 989 BLAKE2B
712a1d842fb9b21cd9ae4dbb7b36283b93ecad64f
DIST linux-6.0.12.tar.xz 133924120 BLAKE2B
40828f7a3acdfca5ba8a0cccde67a19e9c2a73a83dce97cde99d709bd1af035539ff08b2b55df7b47250844be6705fa2d5554f20d909aa7480b31990cc0ec5da
SHA512
8a3060f85bf21ff6b963d82e1de13a553ab5b44d0602941168b007fc008a4a9fda4048974844c215bfc479359d8eb75bf94f5d21177e28a340b7c0db9e29dcfa
DIST linux-6.0.13.tar.sign 989 BLAKE2B
381ccfa7cb46511df7b42ca2fd4f97dc209b91bebb06562cbda9b4186d49a41987baca9f0a80e1106acbdb8198a7f726e6a2932fa7457da364f6f7937df0a726
SHA512
809fc54a6433c630d4e7a427a3bd1108b5fb911a9a26cc3aec312e7c43cf05ee7ae0e75f1074a3dc3353f7723585867d7fd91c6eeff624a838c4e739341506dc
DIST linux-6.0.13.tar.xz 133926352 BLAKE2B
b37026b1cab3079507ff80de9a32c753552689d30fb13898b9b7dd419dfb73785259976ad13fc08b5085b71ca94b84f40b5caf236b13b435c37a3736d64130da
SHA512
6a1287077c7078e9a1bed5401e2eec7dc68cd0a278f6fbe2041a3e92fe005d2a21d251e7daade68ddaa7b303615ea40f0cb7aa702c1535327f4220088b95994d
+DIST linux-6.0.14.tar.sign 989 BLAKE2B
1e1898dbc31fe96eaf0c58d62a07115a28522e7b5fde9510f138ec0e7873f25bc84bd097e529d40bdf4eb908916747570e2b575118de3930cc5092656e916cb3
SHA512
03a67b2195a42edc818861b66e5ad5ff37fbe6056047e5695cd02c83e4a0ba270fa2a13b4994a6034c0e69553399fd570c69f4817b75f10fcde75f17aafdc143
+DIST linux-6.0.14.tar.xz 133938728 BLAKE2B
95adb29df31e257d1bbc0d01b7e908e08a1ab6643fa0e5a185e728629da86a88e6f8d1269f77bc64206dda3d4af10dfb186366c40e108566c87cf43fd05a3555
SHA512
4a409d18bb5c1bf0807a1670ae9a72984fc7df6b0c0fb3289b88eaf6a7d8456fc8481f8e9f4688fa9d27c4a1d85df61323e2bd5b1e534a3b64940aa9eb0dde80
DIST linux-6.0.9.tar.sign 987 BLAKE2B
ccec935f65a836b1f646eccbb453312b4f9e84d06e4f3aa33ed7b8aae03fd8c3f4e505c6560dbac58d2741df991cfab43c014b6175fe94014f758aa434502a44
SHA512
5d5ecb51ae1a0e40f7b505fc14a6a5665efcefd7363dd9d71bffbe4a72ed2498a79d99c1ce7f80712d8cf753d2bba5f0069447385be74994638657b5a4bc7fbd
DIST linux-6.0.9.tar.xz 133911648 BLAKE2B
23ad9036cc771135c4f6bcb17950ec61e182981c4bff596062aa92cfccc66c316b35598e7a162ca4c346ca6b18796e2c5fd8112b05544fdde062faa0c3a82305
SHA512
8269caa07b39c668085c9e956a6924c93b698fef7a927ba59a85e615b4be6828b10dd72502e9a1eedb5a4ef1a271ca78a5dea255be6dd0960536e1574ef7f678
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.14.ebuild
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.14.ebuild
new file mode 100644
index 000000000000..d2f94947b12d
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.14.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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.0.8-gentoo
+GENTOO_CONFIG_VER=g3
+
+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://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[@]}"
+}
