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 7BB90158013 for ; Sun, 3 Dec 2023 18:32:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 265DB2BC025; Sun, 3 Dec 2023 18:32:12 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 070A72BC024 for ; Sun, 3 Dec 2023 18:32:12 +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 23CE8335D76 for ; Sun, 3 Dec 2023 18:32:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 71DDFAEA for ; Sun, 3 Dec 2023 18:32:09 +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: <1701628320.2b92dade5b5d2df45819e71bb63dd7ab2e91e01d.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.1.65.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 2b92dade5b5d2df45819e71bb63dd7ab2e91e01d X-VCS-Branch: master Date: Sun, 3 Dec 2023 18:32:09 +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: 8f8b1851-b119-4778-8074-cb50b0035eed X-Archives-Hash: e739e564e1588251f021caa05ffab221 commit: 2b92dade5b5d2df45819e71bb63dd7ab2e91e01d Author: Michał Górny gentoo org> AuthorDate: Sun Dec 3 15:39:19 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sun Dec 3 18:32:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2b92dade sys-kernel/vanilla-kernel: Bump to 6.1.65 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.65.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 6153602ef1ea..7676deff1464 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -50,6 +50,8 @@ DIST linux-6.1.63.tar.sign 989 BLAKE2B 02c1c472659e3a5c0c4ec98c25ea21c1e4fce0f47 DIST linux-6.1.63.tar.xz 135047184 BLAKE2B fab6c07c2a7658bd3e8b8dac7c20438f892dd97f1364f026a64b96af5cc84ebc0e1c638f56210b49bc45b7e61212857f49c2cf56b976d0713748984462894f17 SHA512 cd80dd1218c6365e0fd424ac399c113d652795c0e0bd7d7b7235ecbebf5d184c3ebd2010732d2b8f05c04392519ba74627629c6ee247fc35b4c61934274b9780 DIST linux-6.1.64.tar.sign 989 BLAKE2B c0e986bc433f3df3d89c0e6ac11f15241f923c6bf0c1fd0e36d80a825a9f81072bfc746d15fd20438c86b5db5c2a17eb448194d07cf81d44a3b5c28cf0b82f86 SHA512 5ba3e13f2299bc4a96f6eb4de2d91f8adb355cac04b757065343b03eb62f83c38a26d06abeda8f3722796113c2494650e79665a42cb38fda8e16f81cdc6a33c9 DIST linux-6.1.64.tar.xz 135052300 BLAKE2B 889bd9a0e0da49c02595ff58b1d73be67ff2db9d55b424468566b2bddc9de2974d8370a8a3d638ba59299b4700919fbaa499b417e1ac2de133f210aa86f646c6 SHA512 84ea64fab869ce3929b90862094d9ca762c3c1cec1ae8c3f7191d33efc4f1ad5ab4f89d2b69b142d5893f17475099e7e4b7f124edf7c0eee2638fa6202fb3d6d +DIST linux-6.1.65.tar.sign 989 BLAKE2B e4bb3748f7fedff2341253e87e3a89a137cb0a8c1f7293141c717a77ccf69c5ed2022c1a6aa065ee89d51ea1c687653692cbd6e02881f53b5cdf71e2c54e4613 SHA512 d795b88f70e769a61366c54003c4a67afea3fb19b2e84d97084f803fe83057266f7ef13929ce87d097379b7d1850eb766fd5f1dde8d5eb8e041c1f6bb9886d03 +DIST linux-6.1.65.tar.xz 135031336 BLAKE2B 998fdc0128c6cee0c8e98dbe697680aa9ac733562fc97041794fef44c7d10096248a9461d447bd5fdd380fb1a86b4da0003b260634dd6b4451484650925ee7d5 SHA512 e56dc54fb12f1fbc696dbac9d3f0f53084232e54861e91703c3e802981c0770d4be2b0df854be606e7c5c38d60a3300882f846e721d778ded0984291724b9919 DIST linux-6.5.10.tar.sign 989 BLAKE2B 01558584b85315a109e03b2b45ec18132d1d166d17ac3b01f5950bd023af1093da942446b2c8944f834c60823a1445d2b6eaaf9e14988f372ba8e1b4d6188fdd SHA512 338e66b81e859e879747333365b354034c4da5e705039fa880eda4f48644829851ce39da7477b0a4bc514f54153e5138bae0b2208f658b05a6c3c295c5af2a47 DIST linux-6.5.10.tar.xz 138982152 BLAKE2B 6a2b93c3419edba1c8c6eddb82d6daaee64129e86575afc647e22088fe65baed2d9db43f2e606522332b1ce58e15ef16bb004b1e09cb641d9d7be15b437f71e1 SHA512 dfdc1b06c210e05060ef8235dc6eb158528d6dca51b9b55fdee94fce73f83e2fa81d5776dd4add88915ef9bb10ce986c2c9592ff1eeb744cda4e90e32b6449a1 DIST linux-6.5.11.tar.sign 989 BLAKE2B 97c1306c90f1bc69e925ec51bcac15964b3f0c3ea4a080f30d15c055b0675e5583f180d66de03c69a83796c79a0bca513363a6f7d68debd4e0845cde392c62b4 SHA512 4da8dd81d3de3c4574196b6e3bc117cbeeb2788c309bee19e599eca495f37b232d82b346501b1016d59312af0c342eb4d0e0d5441494a2f41c490eecb4e8bc80 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.65.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.65.ebuild new file mode 100644 index 000000000000..50ecf4f88f6e --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.65.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.1.7-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 ~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 + ;; + 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[@]}" +}