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 4604F158008 for ; Wed, 14 Jun 2023 15:05:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85CECE094E; Wed, 14 Jun 2023 15:05:55 +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 63CECE094E for ; Wed, 14 Jun 2023 15:05:55 +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 6B5C733BEBC for ; Wed, 14 Jun 2023 15:05:54 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04656A94 for ; Wed, 14 Jun 2023 15:05:53 +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: <1686755133.71d19697845cbbdd68f11f28713d9c188cade5b8.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.34.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 71d19697845cbbdd68f11f28713d9c188cade5b8 X-VCS-Branch: master Date: Wed, 14 Jun 2023 15:05:53 +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: 46bebad9-88be-45c9-877e-3dd4df6c0cc9 X-Archives-Hash: 3d68ca0e5c75eb431a6d4954738e5405 commit: 71d19697845cbbdd68f11f28713d9c188cade5b8 Author: Michał Górny gentoo org> AuthorDate: Wed Jun 14 12:37:23 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jun 14 15:05:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=71d19697 sys-kernel/vanilla-kernel: Bump to 6.1.34 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.34.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 0dac05bbfb49..7e59fa2e7b8a 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -52,6 +52,8 @@ DIST linux-6.1.32.tar.sign 989 BLAKE2B 79d8eefb6212e8f7f3e28956fe3b384e663d57649 DIST linux-6.1.32.tar.xz 134921364 BLAKE2B c2ae22a9dd497617c7bbfab7ef2b31ef03a62679790e6ba82892fa284b51eee50431c10e07f8ddf25b718a6db919d1c80e4089278090070a3f8aa6d94cbfd4c9 SHA512 91ffc55e9f6d4bc4daf600fc751a1dfba8d81132b3184de6b340fb871e28305de8ad2e0293b53c03b062fbdcd9a1774a9b74e301477cd1b1c6eac27c42d15867 DIST linux-6.1.33.tar.sign 989 BLAKE2B 786e48609d244fe23131505fe8a44b07fb1028a662c6653874b5bf3ac8ea6b4ad378e9368add2ef70ea42925e15bdbefc40e852b0b12fb992f188384013d1087 SHA512 a27c5de61f9fd047b48fa8786b3f5e88bf5e4d50a3ab938757866694096c21c830d015c2f83c86050099fcf3abfb8f600dc9a12082509f5f01ca0fc988202beb DIST linux-6.1.33.tar.xz 134917572 BLAKE2B 47341263675a91985e5cf53c6908b19f1c55273198c16bfc4e237de04427282e72755c554816ccdbd7469f12a21a7595767fd56bea5421ca92623abcd08bde26 SHA512 02541074a597fe931370ca38d0de2689efec41073918725cc5678e7598f9017564c2a22548ab5c0eb474ed917dbb4bdbacd322aa56c1d8ec3e7cff9df200cffa +DIST linux-6.1.34.tar.sign 989 BLAKE2B 565ae692b396592b0ec498e9eb3f691cf28ddbce779c6d8051afe42525ae13a6a24916c18fa418940807ab21a1b2da19e75607bc3d6743ff74bba9624df0575b SHA512 8c40f1641f7216e713a031c53bc54da389afdbd2eba750903a66850b8b214b771f8a1fc4aaab0e0d295f0eaaf18307efd90c9c08ab7aa61d7c9165bde89ebbe3 +DIST linux-6.1.34.tar.xz 134979752 BLAKE2B 8998cb16c6d9989bc78422142e9a25962739830f77e352c1ad5562f04fa96f495e195ee64963dd13c84189ce0db24b05d9dc7c13112bda64638d0032f1c475e3 SHA512 181a58f98f42fe584568a45d6360479d9b9fd686f03855926cb3cf7f1d4166f2d306b3966f3d77ba1c41a6ce578c37679cff64b46b9cf8f7daec2886ef62ad1d DIST linux-6.3.5.tar.sign 987 BLAKE2B 34ed1d758eb42af9d27b6aec986c9f52426b19ad9a7483d1b4eb1b4873e7e10efd9c102fa7e17d1fba5df15ba536ab77e6597b607dd07ea9012860fe9eff2c34 SHA512 a701dea5d297c217eb2b497a9441399c0f386f39f74f726f81872f8144d83973ec02ce533b7d48cb9c49d38a98c820668d684927983a001f7a8a27067f605867 DIST linux-6.3.5.tar.xz 136926988 BLAKE2B 646a94591eae93db9301a11e5300579c8cce7d2a544727cb88efed86d05ba070a247498d9c83d7b7cdbead4e7d46537134c877813aa7f188dd36b403c58d0c11 SHA512 91a98c56191645c4ba32f657da59b6be92021b37a698eaf79e1ed3a79b959626386e7b69c8cb0c9eab0645c287a3e53393b1710158eca67b2f66a8d3eaec13de DIST linux-6.3.6.tar.sign 987 BLAKE2B db87514c0b906b3faeaeb55235234f32880de042fb2cfb05035186007d3cbbfa1051f80c54b8d9b2f93ca023e393ff3f360b8eb0dcebc3cd388122bc6cf990bb SHA512 f1c9c7d5f81906f45b6c7c2bab251f56a7fcc0ac11f59b5790e1fe5eee3bcca16da841d70055f15de4d03c24ef611520ea4339d989f4ab89354382997bebd148 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.34.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.34.ebuild new file mode 100644 index 000000000000..e3a0c5f7f691 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.34.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=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[@]}" +}