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 E4E58158004 for ; Wed, 9 Aug 2023 01:59:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B696A2BC027; Wed, 9 Aug 2023 01:59:27 +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 9859B2BC027 for ; Wed, 9 Aug 2023 01:59:27 +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 AAB3033BEFF for ; Wed, 9 Aug 2023 01:59:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D3E6BF38 for ; Wed, 9 Aug 2023 01:59:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1691546341.3a20f1c75bbfa38412da33e35307c21a1ffcdcfc.sam@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-5.10.189.ebuild X-VCS-Directories: sys-kernel/vanilla-kernel/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 3a20f1c75bbfa38412da33e35307c21a1ffcdcfc X-VCS-Branch: master Date: Wed, 9 Aug 2023 01:59:23 +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: 02f0ccb3-a250-434c-bfbd-da577417f8aa X-Archives-Hash: 540efef705465cc9242eb8825f0a89bb commit: 3a20f1c75bbfa38412da33e35307c21a1ffcdcfc Author: Sam James gentoo org> AuthorDate: Tue Aug 8 19:43:04 2023 +0000 Commit: Sam James gentoo org> CommitDate: Wed Aug 9 01:59:01 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a20f1c7 sys-kernel/vanilla-kernel: Bump to 5.10.189 Signed-off-by: Sam James gentoo.org> sys-kernel/vanilla-kernel/Manifest | 2 + .../vanilla-kernel/vanilla-kernel-5.10.189.ebuild | 137 +++++++++++++++++++++ 2 files changed, 139 insertions(+) diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest index 075d9c072a0f..5dcfefcb5541 100644 --- a/sys-kernel/vanilla-kernel/Manifest +++ b/sys-kernel/vanilla-kernel/Manifest @@ -28,6 +28,8 @@ DIST linux-5.10.187.tar.sign 993 BLAKE2B 5739f7361b320d36db7489ceb7afeb56583d436 DIST linux-5.10.187.tar.xz 120576532 BLAKE2B 098bcad0944cbf6bacea7b62baa41e2583561cd1995cdd112ecc9459eec09dc64dcd4ea0c8494a8cb6dc9c17d2482b62b44567ce805c57beac91a84f2ad3ba65 SHA512 c61a22f3f1f9c54e416e8761e52cfb35dccb7c0f9a4171be9893b8e2a5a186d8417b88141f616f109d3429b1676fdaadc79f687a104a0e05a75e2d479af9bd9a DIST linux-5.10.188.tar.sign 993 BLAKE2B b6c7ee466addada512ea6ba9fc86468040e0fea9542d38f468d48f0f9dde0ea0797461a678b1639fb0273422f1e686248469694da008f4cad01fc1da36054b45 SHA512 7a18c298eb35247d3b4574bd651cec57db94b3dce8055e5f901eb7d90ac3e69c5131347fec9fba4f33fa6b431ff03663ab35da25d5b054738ee6197126ac452d DIST linux-5.10.188.tar.xz 120594860 BLAKE2B dd995a1dd78f7eb37a7152d5156e69aedcee5a08587edf826edbdda0544871eb6e10971d3a31cafaa2f9597b6c2b9aa1fcc10904f5054c7d3e6e89583d6f3df2 SHA512 b8f8f560a03ba9a95ccff0eb820286fbb6f17730f3e5959d26dd60ad4c3f4e9344ed7bdf5f7ff3558b52cdcda51a2c9141d0e2901e00d32ed1ece690437148f5 +DIST linux-5.10.189.tar.sign 993 BLAKE2B 8684dde881a3318b6d008225d162d8bc7a9cc91995869bef22d0eaed7da529eda6d0623425c01927768cc176888bef64af6d95498c5d48c1c35c270ced32783b SHA512 df9162e15e2fb943a80a2ad2e285f010b162ff8a7b4fc81f3fde92622bf37430bb3cb088df691fd6e803166ba91fb992467c1cb082f50854b607c1995396ae98 +DIST linux-5.10.189.tar.xz 120616220 BLAKE2B 1fbd10a45e8ef071e7e2f3f816f6150d0c1bc8559db7b628b1af930a83c914614227e6d7a5814a0fe3b9679e52c42d14c7fafa393b1e3e83fdaededdc7d56371 SHA512 24a6446658d0b4bda79d5da16413c838ac3f9f04790b6a61ce1464567cc00d90ccf39f31a9f98096042b042fadc06d324e7e86e99558c16f55dd0fc12bc36843 DIST linux-5.15.122.tar.sign 993 BLAKE2B 8a021595b519795a89fec13df9afa15087823348fc92d91e4306e598faac7b56d892b2db63823023df3ef5dfa7fdbcf887b4daa1a980f166367cc68de0657c9f SHA512 d67c1331aad447c49a2f8f52d38506e3fc2539eab387d84ac9de9fe47db94a2632d7297ff58a161f50deecb32e9a81b7d111438fb0c1b3abff2c346d040f1960 DIST linux-5.15.122.tar.xz 126497672 BLAKE2B ac2861be0226c0f49847cbf7466069712f75e8fb00fadbd3db5ab6e72e70b78f1b7fa954f46be442237112cf069b50c2fc085510e82164d620f15dcbc0517bc9 SHA512 a9eec228d9fc9cde2377b4c5445abf1b15c588bc9a15f529ae4c2924a6fc7daa0b8994ea6266e0648ce347a3b36f2439243b91269e4d8b5eea86296dad1abaaa DIST linux-5.15.123.tar.sign 993 BLAKE2B cdb1ec66d92d6f91c87b52e52f967e7ddea8536b9e1bc4638464b1aee2bc34e5937fc5766c14d1d5b365143f27ce03d24ba357d8c1d7d6f51708d4dfa8add742 SHA512 234865ede0c1aa2f4f7be71858ba872bb2a37f9d85ff423e1085e20bfabf5a55dbb75e63652bf075c791eeb1f382fccbb3092ee33db84d1591e309ef692eb7a1 diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.189.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.189.ebuild new file mode 100644 index 000000000000..3d406f474e2f --- /dev/null +++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.189.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 +CONFIG_VER=5.10.12 +CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530 +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://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config + -> kernel-x86_64-fedora.config.${CONFIG_VER} + ) + arm64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config + -> kernel-aarch64-fedora.config.${CONFIG_VER} + ) + ppc64? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config + -> kernel-ppc64le-fedora.config.${CONFIG_VER} + ) + x86? ( + https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/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[@]}" +}