diff --git a/releases/specs-qemu/alpha/stage1-systemd-mu.spec b/releases/specs-qemu/alpha/stage1-systemd-mu.spec index d491e7aa..000dfff6 100644 --- a/releases/specs-qemu/alpha/stage1-systemd-mu.spec +++ b/releases/specs-qemu/alpha/stage1-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: alpha target: stage1 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/alpha/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage3-alpha-systemd-mergedusr-latest +source_subpath: mergedusr/stage3-alpha-systemd-mergedusr-latest update_seed: yes update_seed_command: -uDN @world portage_confdir: @REPO_DIR@/releases/portage/stages-qemu diff --git a/releases/specs-qemu/alpha/stage3-systemd-mu.spec b/releases/specs-qemu/alpha/stage3-systemd-mu.spec index 49530c53..facce787 100644 --- a/releases/specs-qemu/alpha/stage3-systemd-mu.spec +++ b/releases/specs-qemu/alpha/stage3-systemd-mu.spec @@ -1,10 +1,10 @@ subarch: alpha target: stage3 version_stamp: systemd-mergedusr-@TIMESTAMP@ -rel_type: default +rel_type: mergedusr profile: default/linux/alpha/17.0/systemd/merged-usr snapshot: @TIMESTAMP@ -source_subpath: default/stage1-alpha-systemd-mergedusr-@TIMESTAMP@ +source_subpath: mergedusr/stage1-alpha-systemd-mergedusr-@TIMESTAMP@ portage_confdir: @REPO_DIR@/releases/portage/stages-qemu interpreter: /usr/bin/qemu-alpha compression_mode: pixz diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf index 7c12a687..6b148372 100644 --- a/tools/catalyst-auto-qemu-alpha.conf +++ b/tools/catalyst-auto-qemu-alpha.conf @@ -6,21 +6,21 @@ UPLOAD_KEY=/root/.ssh/id_rsa SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]" -SETS="openrc systemd systemdmu" +SETS="openrc systemd systemd_mu" SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" -SET_systemdmu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" +SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec" KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha update_symlinks() { # Symlink the latest stages3 to build from local d f - for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do + for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do mkdir -p "${d}" pushd "${d}" >/dev/null for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do @@ -35,24 +35,24 @@ post_build() { local set=$1 spec=$2 pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null - case ${spec} in installcd-stage2-minimal.spec) - upload *-${TIMESTAMP}*.iso* + upload install-alpha-minimal-${TIMESTAMP}.iso* ;; stage3-openrc.spec) - upload stage3-*openrc-${TIMESTAMP}*.xz* + upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz* ;; stage3-systemd.spec) - upload stage3-*systemd-${TIMESTAMP}*.xz* - ;; - stage3-systemd-mu.spec) - upload stage3-*systemd-mergedusr-${TIMESTAMP}*.xz* - ;; - *) - echo "Finished ${spec}" + upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz* ;; esac + popd >/dev/null + pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null + case ${spec} in + stage3-systemd-mu.spec) + upload stage3-alpha-systemd-mergedusr-${TIMESTAMP}.tar.xz* + ;; + esac popd >/dev/null }