commit:     b226773e0a7eacb485bafd652bdf2ab985322000
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 16 05:06:31 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Mar 16 08:28:59 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b226773e

sys-kernel/vanilla-kernel: Bump to 6.7.10

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

 sys-kernel/vanilla-kernel/Manifest                 |   2 +
 .../vanilla-kernel/vanilla-kernel-6.7.10.ebuild    | 143 +++++++++++++++++++++
 2 files changed, 145 insertions(+)

diff --git a/sys-kernel/vanilla-kernel/Manifest 
b/sys-kernel/vanilla-kernel/Manifest
index f71b330a3227..51b1a853963f 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -67,6 +67,8 @@ DIST linux-6.6.21.tar.sign 989 BLAKE2B 
2a9fc1ede7eb99492243663a4664679efaca8236d
 DIST linux-6.6.21.tar.xz 140146052 BLAKE2B 
7d13d5f2d5d3c00d66408f1989465067ff05cd8b317c4c81e698d3a2e7d09df7dae8605f9f6cc3614608c0ed84463d1d5e75ed602b71e435981ba78ef55326ab
 SHA512 
e5faa4b32cb1dac14d551a40e460c3b54c021cbe184bb35b0b823539516008e5f50eedbbdb7532e17fc38f41840c397e334f6b5d990176939f13c4397cf28996
 DIST linux-6.6.22.tar.sign 989 BLAKE2B 
aafc276a4dbdcd5ef3767b8ce8a505adb2dbd1e65776671ceee5284eac8953ee1b74643a41eb9808e4cbc30c8deebcc0ff040703fe336b1374b09a65789ab7c1
 SHA512 
a57adc17182f619b576767a41c4cf964ecbaf5d88e3f61068ea86a68ed30089f046556ca02628282ce67727b3e26ada31a458167fc675f1f701e43853a6273c4
 DIST linux-6.6.22.tar.xz 140160884 BLAKE2B 
cea542524dbaea79c27e602b3e0534b5b95243ded95abdcab48f7ab1daf5f6de7231b24d2bc42e52fa27f98be9237534fb92f27ff1ba847df72e363b6147d3ab
 SHA512 
865db70e118f2f26aca4060e9f639fadea271bd55854ed59a8f4cd8a4d0bf89ff418271ea6cbf7355ef9c40f22d18e00503b8ed52c2a09b353a28d895eafa00f
+DIST linux-6.7.10.tar.sign 989 BLAKE2B 
a9d9072cf6e90ca3e4f71f29b97b827e9f1730fa8fea9ad61a38b31c625db5925135441c9698c8ae58664a2375366447d2ad23b1dfe99f714318da18b3102eb9
 SHA512 
113b82ec71d1bc181c866100a712f5635d4ffb7e5f0254ad221236dd00d0cdbbfb4078088086182df66b9d0c65c220a76f594ae0051303a7987b5d995e6fb561
+DIST linux-6.7.10.tar.xz 141439484 BLAKE2B 
5bded11de8e9e22833eae75540c9a0c7591afee00cac0ef4f6e584ac898bebd41c3b51208f0f88210faa17da99ada488c719c7dba8e0d39610b9a84b9c44fe53
 SHA512 
7aec6065f63a7278e19811035cbdd9f80392e89dae49673e79fd6aaf5785e6617df720483e445f3a7bfe4acaf8fe97b305d541b4fc583e5e8c1d320c5366e7a9
 DIST linux-6.7.5.tar.sign 987 BLAKE2B 
7de31f0b12fb5a56d46a0c8f69520f3c35cd4f7bded310c4ffb149935b8d7f35903dc0a759d1f7bf961eb0e5a3eccc22187961efee7d4f0280d78999ef9980df
 SHA512 
d19ffd001bd72356fc5f97838beef6bd5243ffc3e7d03bbd8011339f4a9ddacf66e9d766ad6ac4d09313d213ace89043930f62c67afdcc0179e2211db82ab36b
 DIST linux-6.7.5.tar.xz 141436804 BLAKE2B 
91e5abb3905ba9e8b5cdf26b89758f4454b4e573f148fb08340c60852115d95068e44420d73373a406cb47fb011fc14ee65294489f197a3f7f39d3d8e24b2f2d
 SHA512 
bb99e8b5f98a16e5cb0b5c22b1cff7fb1afff2ec1defea3d7c4da3889bcfd850c97ac485cb95913f85ce80146772539959515e787533c38036f92f8c7e990780
 DIST linux-6.7.6.tar.sign 987 BLAKE2B 
0b124f8131f7e4e01323b6351133bc0cd5bba3c3e40d9c90bd8552d82d710f638b9bdaa5eadbbcfc6aa148128e66d94fe32a9dee87ba29e2f56c7c4056f9106e
 SHA512 
eaa7532efc5c75db114a8f78288821c06b2abf0e70dc7219e8ed357268d88d37e511798f154e6fea0e845c7c35d20efdedb7121bbf4fb01909aa28f9fe224d9e

diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.7.10.ebuild 
b/sys-kernel/vanilla-kernel/vanilla-kernel-6.7.10.ebuild
new file mode 100644
index 000000000000..f1f2ac5dedde
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.7.10.ebuild
@@ -0,0 +1,143 @@
+# Copyright 2020-2024 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.7.8-gentoo
+GENTOO_CONFIG_VER=g11
+
+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 ~loong ~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=/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
+                       ;;
+               loong)
+                       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
+
+       use secureboot && merge_configs+=( 
"${dist_conf_path}/secureboot.config" )
+
+       kernel-build_merge_configs "${merge_configs[@]}"
+}

Reply via email to