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 6CFE5158043 for ; Fri, 23 Feb 2024 17:36:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AC58DE2A10; Fri, 23 Feb 2024 17:36: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 8A1C2E2A10 for ; Fri, 23 Feb 2024 17:36: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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 95F67343083 for ; Fri, 23 Feb 2024 17:36:33 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 07A6B14D2 for ; Fri, 23 Feb 2024 17:36: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: <1708709776.584b3949f897b8f61167e2159be9151bf4c4f2dc.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.79.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 584b3949f897b8f61167e2159be9151bf4c4f2dc X-VCS-Branch: master Date: Fri, 23 Feb 2024 17:36: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: ab2fa2e8-5617-43b9-8e95-2bc3de98ea50 X-Archives-Hash: 8ebec20daa63483c23d1569593e0da31 commit: 584b3949f897b8f61167e2159be9151bf4c4f2dc Author: Michał Górny gentoo org> AuthorDate: Fri Feb 23 13:39:55 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Fri Feb 23 17:36:16 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=584b3949 sys-kernel/vanilla-kernel: Bump to 6.1.79 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.79.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 500a5f0ce0ff..37429b84a3ba 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -45,6 +45,8 @@ DIST linux-6.1.77.tar.sign 989 BLAKE2B bbfb161a4269d7604d60f8e7bfa3ac8ea0139e62e DIST linux-6.1.77.tar.xz 135102528 BLAKE2B 274b2becde7afdd1acecdce612d9e63dedeb493fb2d23c7f49c37b0d43700052ce23eda0206b3e9201f70e3b356022120977dffb8e38143146be3a3f4323afbe SHA512 b5c27926ccab2f53af0d48aa2f4ffdeb30588fb2ac293dd58de554a79de8eef7da463272e04e6af384c80644a0e94bb89a59223d4b488815f83ee336798290b5 DIST linux-6.1.78.tar.sign 989 BLAKE2B efb1b0e91972a07a3dc0b8ed46230566e880f059cb332fd3f3a16837655051f20c89af8b860195a3f5d7083c8f23dd5abf11506b66004b2660a01d87d922d124 SHA512 867a91773f97a928f25107a8837b231e50301f995d5609fd32c3cda12df0897422459e0f73588dabed8da96a75a96cc7c92dfbb7d0e9ee7fcee82f795e854f31 DIST linux-6.1.78.tar.xz 135107092 BLAKE2B 749fdecdb1f97b94d10937e2fd55b04f10c4436b3e3fd76958847f349d9d71b0d8e0682474c59fcba374b8946892ae7c4eefd6d7c7ec9de9c6edca7c00b4159d SHA512 50199fbbd1b8522e87f6a448cd3fae814b6dae493566f769731bfe40da41cbad14f65b3acc419be89e5cc8eebddf4fe38420024874e373697442d627fced4a63 +DIST linux-6.1.79.tar.sign 989 BLAKE2B 242a3973e7872c67d4945e4bb100c1c7ddcfd03deba2347c1430334f996a2ba779d53355a8b38268014cfb538e0de6dce7d051936f25377a5584517876e5551f SHA512 be3ce38f8925ec1dc953fa86b0515ec439e354d6da31da9b67cbcf3471c840c062ba08e25ffc927e4c8aea5579754ed9cff521ed0edb04e949253f7127198639 +DIST linux-6.1.79.tar.xz 135103608 BLAKE2B 1bdcb2dcb04aa5cad56f9c50f511a11df5210e89f9c006a75f08a05cfe4e4b4d444ea850bbfec09b62e2b37894284a762da44396121c50accf6d52e70096e4c2 SHA512 a8d0940c683744c713403304de8970b55beda7cfd339c00f7888236982b68d6577ea9f11f700f0181b66771e3daca2c41dbedce201662d36e9372bda11e10c2e DIST linux-6.6.13.tar.sign 989 BLAKE2B dfb90ac9bdb9f4eaff9eb507dab9a0b111f5e036d7c60128e2f0a93a033cfdfe19f2832d067984316c968bf6ea395d4d32d47c045a68399e93f7c166844b2ad0 SHA512 4af33314518079fab37e9973fdfedff0c08289b1b25932f5b9e83912580cc3cba26dda2591af80dfff0115d969fd714c34195567dfe408657e7b365f4e6f1b03 DIST linux-6.6.13.tar.xz 140067168 BLAKE2B 1d644e48fa4fd3740712130b0d5756b75d70471cda2a7206083434ec89d288bd7487e633c8954ec038e3784d56d7a787e6cab1c93e5fbfcfc0b44a7b55b0debd SHA512 c1598bb1116528525004a677e571117d2b5156cf8f60c84f73e11d9010032b1fd5aaf8e5d286679019db55abb699c2f55de2dbb332c0a96f6337eebd56220863 DIST linux-6.6.14.tar.sign 989 BLAKE2B 1d358aad96d5cc4184cd4f3b4016708e94593bce28072678a9d3b371164212ca15df100bdaa212b842a1aa4d88c7f3504113c9463ea66434cebdf00af2e6eff2 SHA512 4929cba31d9617739de2917d13dfda82c6fa04937a4bd92a55a7d9440ede2c5fe9709bea63f7656c8fea5076b3f936f50391fb2c0ff42828f45584c468575fbf diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.79.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.79.ebuild new file mode 100644 index 000000000000..af7961f3fb66 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.79.ebuild @@ -0,0 +1,137 @@ +# Copyright 2020-2024 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[@]}" +}