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 8E369158041 for ; Thu, 7 Mar 2024 23:38:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CAFA9E29B1; Thu, 7 Mar 2024 23:38:06 +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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A5CCCE29B1 for ; Thu, 7 Mar 2024 23:38:06 +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 8FCB733BE3B for ; Thu, 7 Mar 2024 23:38:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0FDA4B3D for ; Thu, 7 Mar 2024 23:38:04 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1709854663.0c270e053876525716cf6a6391385ea4aab79920.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools/ X-VCS-Repository: proj/releng X-VCS-Files: tools/catalyst-auto-arm.conf X-VCS-Directories: tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 0c270e053876525716cf6a6391385ea4aab79920 X-VCS-Branch: master Date: Thu, 7 Mar 2024 23:38:04 +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: 2bf56911-2704-4437-bdd8-2709c156d0ff X-Archives-Hash: c401243e49bf3859189c9fdcca41533b commit: 0c270e053876525716cf6a6391385ea4aab79920 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Mar 7 23:37:43 2024 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Mar 7 23:37:43 2024 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0c270e05 Enable arm 23.0 musl builds Signed-off-by: Andreas K. Hüttel gentoo.org> tools/catalyst-auto-arm.conf | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index e8dd56e2..37a590fe 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -35,10 +35,14 @@ SETS=" armv6j_hf_systemd_23 armv6j_sf_openrc_23 armv6j_sf_systemd_23 + armv6j_hf_musl_openrc_23 + armv6j_hf_musl_hardened_openrc_23 armv7a_hf_openrc_23 armv7a_hf_systemd_23 armv7a_sf_openrc_23 armv7a_sf_systemd_23 + armv7a_hf_musl_openrc_23 + armv7a_hf_musl_hardened_openrc_23 " SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" @@ -77,12 +81,18 @@ SET_armv6j_hf_systemd_23_SPECS="armv6j/stage1-hardfloat-systemd-23.spec armv6j/s SET_armv6j_sf_openrc_23_SPECS="armv6j/stage1-openrc-23.spec armv6j/stage3-openrc-23.spec" SET_armv6j_sf_systemd_23_SPECS="armv6j/stage1-systemd-23.spec armv6j/stage3-systemd-23.spec" +SET_armv6j_hf_musl_openrc_23_SPECS="armv6j-musl/stage1-hardfloat-23.spec armv6j-musl/stage3-hardfloat-23.spec" +SET_armv6j_hf_musl_hardened_openrc_23_SPECS="armv6j-musl-hardened/stage1-hardfloat-23.spec armv6j-musl-hardened/stage3-hardfloat-23.spec" + SET_armv7a_hf_openrc_23_SPECS="armv7a/stage1-hardfloat-openrc-23.spec armv7a/stage3-hardfloat-openrc-23.spec" SET_armv7a_hf_systemd_23_SPECS="armv7a/stage1-hardfloat-systemd-23.spec armv7a/stage3-hardfloat-systemd-23.spec" SET_armv7a_sf_openrc_23_SPECS="armv7a/stage1-openrc-23.spec armv7a/stage3-openrc-23.spec" SET_armv7a_sf_systemd_23_SPECS="armv7a/stage1-systemd-23.spec armv7a/stage3-systemd-23.spec" +SET_armv7a_hf_musl_openrc_23_SPECS="armv7a-musl/stage1-hardfloat-23.spec armv7a-musl/stage3-hardfloat-23.spec" +SET_armv7a_hf_musl_hardened_openrc_23_SPECS="armv7a-musl-hardened/stage1-hardfloat-23.spec armv7a-musl-hardened/stage3-hardfloat-23.spec" + update_symlinks() { # Symlink the latest stages3 to build from @@ -172,6 +182,19 @@ post_build() { popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null + + case ${spec} in + armv7a-musl/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl + ;; + armv6j-musl/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl + ;; + esac + + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null case ${spec} in @@ -187,6 +210,19 @@ post_build() { popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null + + case ${spec} in + armv7a-musl-hardened/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl_hardened + ;; + armv6j-musl-hardened/stage3-hardfloat-23.spec) + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl_hardened + ;; + esac + + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null case ${spec} in