From a9c2966b9bec3cce5d92e104d25a8e4975e8ab32 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Sun, 24 Dec 2023 23:08:16 +0100 Subject: [PATCH] Upload s390 17.0 packages with openrc build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- tools/catalyst-auto-s390.conf | 7 +------ tools/catalyst-auto-s390x.conf | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf index 1e46ab4a..a9cbf249 100644 --- a/tools/catalyst-auto-s390.conf +++ b/tools/catalyst-auto-s390.conf @@ -11,8 +11,6 @@ SETS="openrc systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" -SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" - SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 @@ -20,7 +18,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do + for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do @@ -44,9 +42,6 @@ post_build() { ;; stage3-openrc.spec) upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz* - ;; - stage3-systemd.spec) - upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390 ;; esac diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf index baf4ca90..f4fe9d83 100644 --- a/tools/catalyst-auto-s390x.conf +++ b/tools/catalyst-auto-s390x.conf @@ -11,8 +11,6 @@ SETS="openrc systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec" -SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" - SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 @@ -20,7 +18,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390 update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do + for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do @@ -44,9 +42,6 @@ post_build() { ;; stage3-openrc.spec) upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz* - ;; - stage3-systemd.spec) - upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz* upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x ;; esac