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 2074C158020 for ; Fri, 14 Oct 2022 18:15:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 44998E0825; Fri, 14 Oct 2022 18:15:24 +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 25A29E0825 for ; Fri, 14 Oct 2022 18:15:24 +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 F25FF340F14 for ; Fri, 14 Oct 2022 18:15:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 592275F6 for ; Fri, 14 Oct 2022 18:15:21 +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: <1665771311.c769e473060534825b12bf85c650d7036e1a833c.dilfridge@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/arm64/musl-llvm/, releases/specs/arm64/llvm/, tools/ X-VCS-Repository: proj/releng X-VCS-Files: releases/specs/arm64/llvm/stage1-openrc.spec releases/specs/arm64/llvm/stage1-systemd.spec releases/specs/arm64/llvm/stage3-openrc.spec releases/specs/arm64/llvm/stage3-systemd.spec releases/specs/arm64/musl-llvm/stage1.spec releases/specs/arm64/musl-llvm/stage3.spec tools/catalyst-auto-arm64.conf X-VCS-Directories: releases/specs/arm64/musl-llvm/ releases/specs/arm64/llvm/ tools/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: c769e473060534825b12bf85c650d7036e1a833c X-VCS-Branch: master Date: Fri, 14 Oct 2022 18:15:21 +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: 17a78975-0276-4130-848f-290168fd16e0 X-Archives-Hash: 7b0e438b6c5688a7fda144442290a3f0 commit: c769e473060534825b12bf85c650d7036e1a833c Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Oct 14 18:14:41 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Oct 14 18:15:11 2022 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c769e473 Add arm64 llvm stages Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/arm64/llvm/stage1-openrc.spec | 12 +++++++++ releases/specs/arm64/llvm/stage1-systemd.spec | 12 +++++++++ releases/specs/arm64/llvm/stage3-openrc.spec | 10 +++++++ releases/specs/arm64/llvm/stage3-systemd.spec | 10 +++++++ releases/specs/arm64/musl-llvm/stage1.spec | 13 +++++++++ releases/specs/arm64/musl-llvm/stage3.spec | 10 +++++++ tools/catalyst-auto-arm64.conf | 38 +++++++++++++++++++++++++-- 7 files changed, 103 insertions(+), 2 deletions(-) diff --git a/releases/specs/arm64/llvm/stage1-openrc.spec b/releases/specs/arm64/llvm/stage1-openrc.spec new file mode 100644 index 00000000..d9974b4e --- /dev/null +++ b/releases/specs/arm64/llvm/stage1-openrc.spec @@ -0,0 +1,12 @@ +subarch: arm64 +target: stage1 +version_stamp: llvm-openrc-@TIMESTAMP@ +rel_type: llvm +profile: default/linux/arm64/17.0/llvm +snapshot: @TIMESTAMP@ +source_subpath: llvm/stage3-arm64-llvm-openrc-latest.tar.xz +compression_mode: pixz +update_seed: yes +update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm64/llvm/stage1-systemd.spec b/releases/specs/arm64/llvm/stage1-systemd.spec new file mode 100644 index 00000000..1c450492 --- /dev/null +++ b/releases/specs/arm64/llvm/stage1-systemd.spec @@ -0,0 +1,12 @@ +subarch: arm64 +target: stage1 +version_stamp: llvm-systemd-@TIMESTAMP@ +rel_type: llvm +profile: default/linux/arm64/17.0/systemd/llvm +snapshot: @TIMESTAMP@ +source_subpath: llvm/stage3-arm64-llvm-systemd-latest.tar.xz +compression_mode: pixz +update_seed: yes +update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm64/llvm/stage3-openrc.spec b/releases/specs/arm64/llvm/stage3-openrc.spec new file mode 100644 index 00000000..dc5ef2ee --- /dev/null +++ b/releases/specs/arm64/llvm/stage3-openrc.spec @@ -0,0 +1,10 @@ +subarch: arm64 +target: stage3 +version_stamp: llvm-openrc-@TIMESTAMP@ +rel_type: llvm +profile: default/linux/arm64/17.0/llvm +snapshot: @TIMESTAMP@ +source_subpath: llvm/stage1-arm64-llvm-openrc-@TIMESTAMP@.tar.xz +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm64/llvm/stage3-systemd.spec b/releases/specs/arm64/llvm/stage3-systemd.spec new file mode 100644 index 00000000..1b8bf1a8 --- /dev/null +++ b/releases/specs/arm64/llvm/stage3-systemd.spec @@ -0,0 +1,10 @@ +subarch: arm64 +target: stage3 +version_stamp: llvm-systemd-@TIMESTAMP@ +rel_type: llvm +profile: default/linux/arm64/17.0/systemd/llvm +snapshot: @TIMESTAMP@ +source_subpath: llvm/stage1-arm64-llvm-systemd-@TIMESTAMP@.tar.xz +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm64/musl-llvm/stage1.spec b/releases/specs/arm64/musl-llvm/stage1.spec new file mode 100644 index 00000000..8686a291 --- /dev/null +++ b/releases/specs/arm64/musl-llvm/stage1.spec @@ -0,0 +1,13 @@ +subarch: arm64 +target: stage1 +version_stamp: musl-llvm-@TIMESTAMP@ +rel_type: musl-llvm +profile: default/linux/arm64/17.0/musl/llvm +snapshot: @TIMESTAMP@ +source_subpath: musl-llvm/stage3-arm64-musl-llvm-latest.tar.xz +compression_mode: pixz +update_seed: yes +update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng +chost: aarch64-gentoo-linux-musl diff --git a/releases/specs/arm64/musl-llvm/stage3.spec b/releases/specs/arm64/musl-llvm/stage3.spec new file mode 100644 index 00000000..ae700bdc --- /dev/null +++ b/releases/specs/arm64/musl-llvm/stage3.spec @@ -0,0 +1,10 @@ +subarch: arm64 +target: stage3 +version_stamp: musl-llvm-@TIMESTAMP@ +rel_type: musl-llvm +profile: default/linux/arm64/17.0/musl/llvm +snapshot: @TIMESTAMP@ +source_subpath: musl-llvm/stage1-arm64-musl-llvm-@TIMESTAMP@.tar.xz +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 8519d23d..86add3b6 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -6,15 +6,20 @@ UPLOAD_KEY=/root/.ssh/id_ed25519 SPECS_DIR=${REPO_DIR}/releases/specs/arm64 SUBARCH=arm64 -SETS="openrc systemd musl muslhardened" +SETS="openrc llvmopenrc systemd llvmsystemd musl muslhardened muslllvm" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec stage3d-systemd.spec" +SET_llvmopenrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec" +SET_llvmsystemd_SPECS="llvm/stage1-systemd.spec llvm/stage3-systemd.spec" + SET_musl_SPECS="musl/stage1.spec musl/stage3.spec" SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec" +SET_muslllvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec" + KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64 EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" @@ -22,7 +27,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]" update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/llvm" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/musl-llvm"; do pushd "${d}" >/dev/null for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do local of=$(echo "${f}" | convert_filename) @@ -60,6 +65,22 @@ post_build() { popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null + + case ${spec} in + llvm/stage3-openrc.spec) + upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz* + ;; + llvm/stage3-systemd.spec) + upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz* + ;; + *) + echo "Finished ${spec}" + ;; + esac + + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null case ${spec} in @@ -85,4 +106,17 @@ post_build() { esac popd >/dev/null + + pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null + + case ${spec} in + musl-llvm/stage3.spec) + upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz* + ;; + *) + echo "Finished ${spec}" + ;; + esac + + popd >/dev/null }