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 C73BB158451 for ; Wed, 10 Jan 2024 21:12:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DF9FEE2A3B; Wed, 10 Jan 2024 21:12:09 +0000 (UTC) Received: from smtp.gentoo.org (mail.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 BD273E2A3A for ; Wed, 10 Jan 2024 21:12: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 D42973431C0 for ; Wed, 10 Jan 2024 21:12:08 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 43ABF12D7 for ; Wed, 10 Jan 2024 21:12:07 +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: <1704921104.836a928c09e6eb707eb562091d0e82b33e441677.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.72.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 836a928c09e6eb707eb562091d0e82b33e441677 X-VCS-Branch: master Date: Wed, 10 Jan 2024 21:12:07 +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: f6ac1515-ed3f-45d4-8eef-cf718d7975a2 X-Archives-Hash: 7aab30679c11d2cb2654d44010c2dc19 commit: 836a928c09e6eb707eb562091d0e82b33e441677 Author: Michał Górny gentoo org> AuthorDate: Wed Jan 10 17:32:22 2024 +0000 Commit: Michał Górny gentoo org> CommitDate: Wed Jan 10 21:11:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=836a928c sys-kernel/vanilla-kernel: Bump to 6.1.72 Signed-off-by: Michał Górny gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-6.1.72.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 5f17b41e5232..22914f7ef86d 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -30,6 +30,8 @@ DIST linux-6.1.70.tar.sign 989 BLAKE2B 25bd23eab2b1afcdd401f93946b73c05eb2fd2079 DIST linux-6.1.70.tar.xz 135042228 BLAKE2B e32727946bb9169bc903b051dfbbb1423b3fef3fe124162fe1125f1364b3ebd4ab8e4195a788f5102b056be7d23acd88e4a2d1da6f1e6c5546552bcefb1283a1 SHA512 e5ad2477005291d21168d9417f329b3ddee47d0af5ada3e7325490f2a673c9546458e84829aff0728f23a07d693470a7650ae64106e46aa76af4cbf92c22cd36 DIST linux-6.1.71.tar.sign 989 BLAKE2B 2e6ebf3fb8b0cb42f1a23620a0eec961287765ab615eb33bf7f7dc958174ceabc755db2ffe8bab4817c2df00b8aad300099b8a8b7d9cf8e64744d65679a6aa79 SHA512 a7135eace1fb6abc4ec126c4341c21aaa3bb6aa53309b95cd59692ff7b4fdea3b67e2a5eaa0af263c947e9354db005397aef71c658eeb98b4505940ec46a1c11 DIST linux-6.1.71.tar.xz 135083476 BLAKE2B 7248500afc76b024a07bed56418c70b1e7c6729836b7820a95ed7ddd0ebdc83b473d91bbfbe99e352692702054029dff157fc5dd345b9ebaf8f18d0e39f0e36b SHA512 ae0633231fb88c68406944a73e751e4d6409f60e342d6ca32d6b84a70eae9ce52dbb2a50e60947ec52fef7ef00ad6ffa31361482341f2e3c0cc84815ac405ad5 +DIST linux-6.1.72.tar.sign 989 BLAKE2B ae4fc78466ad35ec01110e7519612ccb5db6249a9db2230cc0e3afd8d3c06d91e6d648d33d241d33037b9ffe241e98f388c6e8055586aa8d32903527effb207a SHA512 b641965a04a0dd90baca2b11b4d7b5237c23ec4afd7f9c8e4ab4cc5030f02c83d43fde7358683b9035751727030c861812cf2b67e45779aee822187c2b7c292f +DIST linux-6.1.72.tar.xz 135059944 BLAKE2B 14c55436d9e676c6ace598c54c353c3a28783c5984acc45e9668fe0da1ebe17c7f7a05f12b7fe2eb439b358423da4753138c06c1ba041bed78e4d3786128042b SHA512 b7ca2baef22dee353bd27584148a03e11d381a552288bb616252dc09186dc351177348a2bf564b555f6ff2cb790580f82f2a3734c7da3cf3ce6d39e6ac35cc41 DIST linux-6.6.10.tar.sign 989 BLAKE2B dd8064c58383efa9227acd2b8ebdecaaf30725e7df8a33810df07a7290d00da282a9584f78fef585e7bcb8f6922d550b99579f59863061aeeac5d5c87f2cce2a SHA512 ec5ccfce8e6bcb5fa16d1bc30f4bfc9d15ed4b88ea455d16f5b043e764e2213c1913288a8226c9fdacba835e1cf164c589f04f0b76d38a8347bdcaea0d4c9fa3 DIST linux-6.6.10.tar.xz 140042308 BLAKE2B c71e651438216e86e436af032cb529c029351b72b460568bd75858f835212360d646bae27caeb3140a4234f4155553aceec3aa94d761e3a634be7c164eee86a4 SHA512 5f2de63021a30e9507713ca98515fa1de15f4958ba115beb2e2a4cf331d00f7e6520ac938f6a4732a68fa21da8c0e142b5db1c9be4f604a14bddc20ea596dc8b DIST linux-6.6.9.tar.sign 987 BLAKE2B 947a3f09c87d9d02a8f8b5330d25cddc6f71ab501d2f52804ca0fa5394cdd5df27e413a17c1af5eba09afd0494328c122e76fec6a7792ba6c889c6d8ba7ab27a SHA512 e25e0b8cae76be052711c3113a7acfc0ecfd7e735fb0a3c7716ac8fdac689ff3f0ac51c6ea0677f3e585561f9c777dfb12b397ce25a323df7728b3352596f74c diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.72.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.72.ebuild new file mode 100644 index 000000000000..af7961f3fb66 --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.72.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[@]}" +}