From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3C42C15802F for ; Fri, 31 Mar 2023 17:09:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 68B8BE0822; Fri, 31 Mar 2023 17:09:34 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 18652E0829 for ; Fri, 31 Mar 2023 17:09:34 +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 F1C58340FC5 for ; Fri, 31 Mar 2023 17:09:32 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 385B1A0D for ; Fri, 31 Mar 2023 17:09:31 +0000 (UTC) From: "Michał Górny" 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" Message-ID: <1680282556.15ce350c7292f6f796f7deac2b0d6c7bf2520713.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.2.9.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 15ce350c7292f6f796f7deac2b0d6c7bf2520713 X-VCS-Branch: master Date: Fri, 31 Mar 2023 17:09:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 612c4c3d-e92a-4370-803c-ece30cd2b313 X-Archives-Hash: abf16d39b1e711566c324d13be721909 commit: 15ce350c7292f6f796f7deac2b0d6c7bf2520713 Author: Michał Górny gentoo org> AuthorDate: Fri Mar 31 11:43:40 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Mar 31 17:09:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15ce350c sys-kernel/vanilla-kernel: Bump to 6.2.9 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.2.9.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 6fe8df6927f6..bd595e5cad21 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -74,3 +74,5 @@ DIST linux-6.2.7.tar.sign 987 BLAKE2B 527bf1b3daf6b0d37f21c30a8bc4195193eb991190 DIST linux-6.2.7.tar.xz 136484084 BLAKE2B 9f2b39992c9e56e37ce0544f1a19d8d5285250bd5ef25e5df726b7c865dd0ee5555f1536a139583fad4d268e959c5b12b16d224e6630d621c1c10125ac6bb123 SHA512 d666508c3ea1fab92a7e05113c76eee0cae83450a16efb63fc414bb03c56390500c49699700f5b1799ae0eb0c5257792201ae480f6a71f6fab1ab2f268d76f27 DIST linux-6.2.8.tar.sign 987 BLAKE2B c43d287253a212a16f080bae2a5b8b5381283c4fd524bbf33fc141f30d7f4cf7d4794ed1f1a11e755599e16060e8048596394dffa7119e147c82c37fb65f65f8 SHA512 beab51d58dd884b94e21aa01cdf36943a5f63e4b4f5931063814573d7d475332f6eec5e075cf2ed2bb918e512400cb6329319904c7032d4fac8fc854067452ac DIST linux-6.2.8.tar.xz 136475840 BLAKE2B 2af871403a7abb3170ceb3f065fe162a82b80335dac7d6a8207f1cb12f235e2900b61a578eb8426b1c3854d42a227b0bda96bfdd3cfcda6797dbd68df8a205f2 SHA512 4ed96aff4d6b21fec294d3beb4bc470b9026e165b7c3693acfd11dc670749d595946a7bfc8689bc864608410b1f06a89851bceb6f73eeaca039e49a140970731 +DIST linux-6.2.9.tar.sign 987 BLAKE2B 5033decd1eff5ad014e1ce18550b4f9575fff21884f74d73ca16ea83635ff1c707632741c43c1c6bed52c5926e1b574d582cd0a6f633c06432bc5a57dbb03b6d SHA512 83928f4aa597c7e3b3fd1cc9b097f8c5b9b78d5cfb3cdaa3ffc79a6014d92534c6dfb95f8a3cf924c139d2c71afc20110db3fc4f77c198c10f78b57143311a5b +DIST linux-6.2.9.tar.xz 136449836 BLAKE2B 0e7ad5502767cb74fa0fea79884ce753be0421a56bbbe0a6cb66add5839b3329298671725595c0624886d9d2836c4e9d4bd152acefb2b3df1cf7a1013e0178ba SHA512 1ea62ac96dec4a11c18b2a2e8bd5ac42b10c63a861f515b8441550fe93702122d73020fec84c5538656e6aea2fbed7966bbb07055f489f4b865ff4c3be806c9f diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.9.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.9.ebuild new file mode 100644 index 000000000000..1ec99df30db5 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.9.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2023 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.2.6-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[@]}" +}