From 58341efc5ea9d949bea40e97877aae7eb3437b53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Tue, 15 Aug 2023 23:33:33 +0200 Subject: [PATCH] More binpackages and some cleanup 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-amd64.conf | 3 + tools/catalyst-auto-filter-stage4only.conf | 18 ------ tools/catalyst-auto-ia64.conf | 1 + tools/catalyst-auto-qemu-hppa.conf | 66 ---------------------- tools/catalyst-auto-qemu-mips-common | 1 + tools/catalyst-auto-qemu-mips.conf | 5 -- tools/catalyst-auto-qemu-mipsel.conf | 5 -- 7 files changed, 5 insertions(+), 94 deletions(-) delete mode 100644 tools/catalyst-auto-filter-stage4only.conf delete mode 100644 tools/catalyst-auto-qemu-hppa.conf delete mode 100644 tools/catalyst-auto-qemu-mips.conf delete mode 100644 tools/catalyst-auto-qemu-mipsel.conf diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 478ed5ba..fa78a418 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -113,12 +113,14 @@ post_build() { ;; stage3-systemd.spec) upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz* + # do not upsync_binpackages, done by extra builder ;; stage3d-openrc.spec) upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz* ;; stage3d-systemd.spec) upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz* + # do not upsync_binpackages, done by extra builder ;; installcd-stage2-minimal.spec) upload install-amd64-minimal-${TIMESTAMP}.iso* @@ -128,6 +130,7 @@ post_build() { ;; nomultilib/stage3-systemd.spec) upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz* + # do not upsync_binpackages, done by extra builder ;; x32/stage3-openrc.spec) upload stage3-x32-openrc-${TIMESTAMP}.tar.xz* diff --git a/tools/catalyst-auto-filter-stage4only.conf b/tools/catalyst-auto-filter-stage4only.conf deleted file mode 100644 index a41e4bda..00000000 --- a/tools/catalyst-auto-filter-stage4only.conf +++ /dev/null @@ -1,18 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -# This configuration does not set any builds of it's own, but rather removes -# everything EXCEPT stage4 builds. -for s in $SETS ; do - var=SET_${s}_SPECS - val=${!var} - newval= - for spec in $val ; do - case $spec in - *stage4*) newval="${newval} $spec" ;; - esac - done - eval "export $var='${newval}'" -done - -# vim:ft=sh: diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf index 5f386b4c..b18765e2 100644 --- a/tools/catalyst-auto-ia64.conf +++ b/tools/catalyst-auto-ia64.conf @@ -47,6 +47,7 @@ post_build() { ;; stage3-systemd.spec) upload stage3-ia64-systemd-${TIMESTAMP}.tar.xz* + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64 ;; esac popd >/dev/null diff --git a/tools/catalyst-auto-qemu-hppa.conf b/tools/catalyst-auto-qemu-hppa.conf deleted file mode 100644 index 7fdfccba..00000000 --- a/tools/catalyst-auto-qemu-hppa.conf +++ /dev/null @@ -1,66 +0,0 @@ -# This is the config file for the catalyst-auto script. It should be pretty -# self-explanatory. - -UPLOAD_USER=hppa -UPLOAD_KEY=/root/.ssh/id_ed25519 -SPECS_DIR=${REPO_DIR}/releases/specs-qemu/hppa - -SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu" - -SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec" -SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec" - -SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec" - -SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec hppa1.1/stage3-systemd-mu.spec" - -KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa - -EMAIL_SUBJECT_PREPEND="[hppa-qemu-auto]" - -update_symlinks() { - # Symlink the latest stages3 to build from - local d f t - for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do - mkdir -p "${d}" - pushd "${d}" >/dev/null - for t in hppa1.1 ; do - for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do - local of=$(echo "${f}" | convert_filename) - ln -sf "${f}" "${of}" - done - done - popd >/dev/null - done -} - -post_build() { - local set=$1 spec=$2 - - pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - case ${spec} in - netboot-hppa32.spec) - ls -l netboot-hppa1.1-${TIMESTAMP}/ - mv -v netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif - upload netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif - ;; - installcd-stage2-minimal.spec) - upload install-hppa-minimal-*${TIMESTAMP}*.iso* - ;; - hppa1.1/stage3-openrc.spec) - upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz* - ;; - hppa1.1/stage3-systemd.spec) - upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz* - ;; - esac - popd >/dev/null - - pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null - case ${spec} in - hppa1.1/stage3-systemd-mu.spec) - upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz* - ;; - esac - popd >/dev/null -} diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common index 99dee3e3..fea7bff8 100644 --- a/tools/catalyst-auto-qemu-mips-common +++ b/tools/catalyst-auto-qemu-mips-common @@ -176,6 +176,7 @@ post_build() { ;; stage3-mipsel3-n64-openrc.spec) upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz* + upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64 ;; stage3-mipsel3-n64-systemd.spec) upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz* diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf deleted file mode 100644 index 5e594770..00000000 --- a/tools/catalyst-auto-qemu-mips.conf +++ /dev/null @@ -1,5 +0,0 @@ -# only BE - -source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common - -SETS=${SETS_BE} diff --git a/tools/catalyst-auto-qemu-mipsel.conf b/tools/catalyst-auto-qemu-mipsel.conf deleted file mode 100644 index 9434e91e..00000000 --- a/tools/catalyst-auto-qemu-mipsel.conf +++ /dev/null @@ -1,5 +0,0 @@ -# only LE - -source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common - -SETS=${SETS_LE}