From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1703381-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3F0911580FD for <garchives@archives.gentoo.org>; Fri, 27 Dec 2024 17:57:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E6E74E081A; Fri, 27 Dec 2024 17:57:09 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CD4F3E0826 for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2024 17:57:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF626335D77 for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2024 17:57:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2A75618FC for <gentoo-commits@lists.gentoo.org>; Fri, 27 Dec 2024 17:57:07 +0000 (UTC) From: "Michał Górny" <mgorny@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" <mgorny@gentoo.org> Message-ID: <1735322216.3ba8ae0ffa451ed8ce5d84d89bff1eb6c01b1887.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-kernel/vanilla-kernel/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-kernel/vanilla-kernel/Manifest sys-kernel/vanilla-kernel/vanilla-kernel-6.6.68.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 3ba8ae0ffa451ed8ce5d84d89bff1eb6c01b1887 X-VCS-Branch: master Date: Fri, 27 Dec 2024 17:57:07 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 60dc16dc-5d63-4806-acac-5d83fd01f373 X-Archives-Hash: 47f0120f83086f942074fa7e1496b91c commit: 3ba8ae0ffa451ed8ce5d84d89bff1eb6c01b1887 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Fri Dec 27 14:14:54 2024 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Fri Dec 27 17:56:56 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3ba8ae0f sys-kernel/vanilla-kernel: Bump to 6.6.68 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.6.68.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 0e53a9c9d837..7a83d7eb95c5 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -76,3 +76,5 @@ DIST linux-6.6.66.tar.sign 989 BLAKE2B 455a8d1b5adeb1f6e817b8c1a82a8cb8c104a504b DIST linux-6.6.66.tar.xz 140430488 BLAKE2B 31b9f40d8279921c4c1ee8c7b1e053fbce3aa4221a0ede651747a2e5556a8fb9d32a6f4fed027f53ccd3f5b2bfda0d2d3036a2282ef6cd65e5b665534231ca14 SHA512 5c1035df8395f23678f17bd8b40d09061fd74299f75a723bd482ab39304eb1de4f460f121f144554d33df8497d7d5f13a975332ac4bef8a5c0ac7a5fc05e6b7b DIST linux-6.6.67.tar.sign 989 BLAKE2B abc1c4de4fdb8aaa60819eb995ddacac505915bc43b8b34ad0d6dee9b886df84732e584d2a4825ba2e29a0863a4e42cf72df214aa357523c9aa2b10b0fe2dec7 SHA512 c14edffd5f107714b8f5e9dcb345972b9cd7f1cb9accd8ec5ec50ae2ed799ed835f2785a65bb67669f6c31c9b35193f00f31b60683b210f8c17aebb6b6362623 DIST linux-6.6.67.tar.xz 140474128 BLAKE2B bf0038d4aa9e1857a2dc866c18ed54b16e6ab1f1cd6a3f9636e1c60006ffb226acc97ac221b8337b70d0d1bba7d4b65ea4cb476c21a5972f5a194da8ee0e3728 SHA512 78d52b467d0f7d632efbc626e13adad0bcf87d0bb0acb8ec4aaf218fb35e13007e4b157939cc7fdc6668989554eae0c769684c6b77e0b9014d298afe56c5c4fa +DIST linux-6.6.68.tar.sign 989 BLAKE2B d374d5d334585a5e5102c1eb1c65f90f34c683e4f8dcfd635afd64fe770bbab39435dcabeb717d1318c503ee8484ec179ac20f413c07d8b7edc28c2f6a531763 SHA512 795a0d4141ecec61597f01676569397735cc12b921ef00070b11c3af168e4e6f43970ac192c31a8ca4902c999fbcba9985f6326d78107b06093110d74e576df5 +DIST linux-6.6.68.tar.xz 140431644 BLAKE2B bbcd2e647aba409aa6191a5887becdaecb47c99d0e50bb35974b907fcf2c54fc7ef124e64ca70255a7d309617493ab4e1e273a2b2fa45bc56e35214d906fd9f3 SHA512 d02d15e32d4f36535cb140b530127d64acdf80a83e39ef44fe9f7c9a745ea01cecc0c727b34ec2e50f42bba8fe1d5dc55a2fc38fa143d9397f235e0eadf0aaff diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.68.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.68.ebuild new file mode 100644 index 000000000000..024fb0dc392c --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.6.68.ebuild @@ -0,0 +1,137 @@ +# 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.6.12-gentoo +GENTOO_CONFIG_VER=g14 + +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 -xf -)) + 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 + arm | hppa | loong) + > .config || die + ;; + amd64) + cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die + ;; + arm64) + cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die + biendian=true + ;; + 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[@]}" +}