Move ia64 merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
parent
cc592e180a
commit
216dea7382
|
@ -1,10 +1,10 @@
|
|||
subarch: ia64
|
||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||
target: stage1
|
||||
rel_type: default
|
||||
rel_type: mergedusr
|
||||
profile: default/linux/ia64/17.0/systemd/merged-usr
|
||||
snapshot: @TIMESTAMP@
|
||||
source_subpath: default/stage3-ia64-systemd-mergedusr-latest
|
||||
source_subpath: mergedusr/stage3-ia64-systemd-mergedusr-latest
|
||||
compression_mode: pixz
|
||||
update_seed: no
|
||||
update_seed_command: --update --deep --newuse @world
|
||||
|
|
|
@ -1,10 +1,10 @@
|
|||
subarch: ia64
|
||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||
target: stage3
|
||||
rel_type: default
|
||||
rel_type: mergedusr
|
||||
profile: default/linux/ia64/17.0/systemd/merged-usr
|
||||
snapshot: @TIMESTAMP@
|
||||
source_subpath: default/stage1-ia64-systemd-mergedusr-@TIMESTAMP@
|
||||
source_subpath: mergedusr/stage1-ia64-systemd-mergedusr-@TIMESTAMP@
|
||||
compression_mode: pixz
|
||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||
portage_prefix: releng
|
||||
|
|
|
@ -5,15 +5,25 @@ UPLOAD_USER=ia64
|
|||
UPLOAD_KEY=/root/.ssh/id_rsa
|
||||
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
|
||||
|
||||
SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec stage3-systemd.spec stage1-systemd-mu.spec stage3-systemd-mu.spec"
|
||||
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
|
||||
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_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
|
||||
|
||||
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
|
||||
|
||||
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
|
||||
|
@ -28,24 +38,24 @@ post_build() {
|
|||
local set=$1 spec=$2
|
||||
|
||||
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
|
||||
|
||||
case ${spec} in
|
||||
installcd-stage2*)
|
||||
upload *${TIMESTAMP}*.iso*
|
||||
;;
|
||||
stage3-openrc.spec)
|
||||
upload stage3-*openrc-${TIMESTAMP}*.xz*
|
||||
upload stage3-ia64-openrc-${TIMESTAMP}.xz*
|
||||
;;
|
||||
stage3-systemd.spec)
|
||||
upload stage3-*systemd-${TIMESTAMP}*.xz*
|
||||
;;
|
||||
stage3-systemd-mu.spec)
|
||||
upload stage3-*systemd-mergedusr-${TIMESTAMP}*.xz*
|
||||
;;
|
||||
*)
|
||||
echo "Finished ${spec}"
|
||||
upload stage3-ia64-systemd-${TIMESTAMP}.xz*
|
||||
;;
|
||||
esac
|
||||
popd >/dev/null
|
||||
|
||||
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
|
||||
case ${spec} in
|
||||
stage3-systemd-mu.spec)
|
||||
upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.xz*
|
||||
;;
|
||||
esac
|
||||
popd >/dev/null
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue