Move s390 merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
parent
1810d7e21b
commit
70c5609b66
|
@ -1,10 +1,10 @@
|
||||||
subarch: s390
|
subarch: s390
|
||||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||||
target: stage1
|
target: stage1
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/s390/17.0/systemd/merged-usr
|
profile: default/linux/s390/17.0/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-s390-systemd-mergedusr-latest
|
source_subpath: mergedusr/stage3-s390-systemd-mergedusr-latest
|
||||||
update_seed: no
|
update_seed: no
|
||||||
update_seed_command: --update --deep --newuse @world
|
update_seed_command: --update --deep --newuse @world
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: s390
|
subarch: s390
|
||||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||||
target: stage3
|
target: stage3
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/s390/17.0/systemd/merged-usr
|
profile: default/linux/s390/17.0/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage1-s390-systemd-mergedusr-@TIMESTAMP@
|
source_subpath: mergedusr/stage1-s390-systemd-mergedusr-@TIMESTAMP@
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390
|
pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: s390x
|
subarch: s390x
|
||||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||||
target: stage1
|
target: stage1
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/s390/17.0/s390x/systemd/merged-usr
|
profile: default/linux/s390/17.0/s390x/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-s390x-systemd-mergedusr-latest
|
source_subpath: mergedusr/stage3-s390x-systemd-mergedusr-latest
|
||||||
update_seed: no
|
update_seed: no
|
||||||
update_seed_command: --update --deep --newuse @world
|
update_seed_command: --update --deep --newuse @world
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: s390x
|
subarch: s390x
|
||||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||||
target: stage3
|
target: stage3
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/s390/17.0/s390x/systemd/merged-usr
|
profile: default/linux/s390/17.0/s390x/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage1-s390x-systemd-mergedusr-@TIMESTAMP@
|
source_subpath: mergedusr/stage1-s390x-systemd-mergedusr-@TIMESTAMP@
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x
|
pkgcache_path: /var/tmp/catalyst/packages/default/stage3-s390x
|
||||||
|
|
|
@ -20,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
|
||||||
update_symlinks() {
|
update_symlinks() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
local d f
|
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}"
|
mkdir -p "${d}"
|
||||||
pushd "${d}" >/dev/null
|
pushd "${d}" >/dev/null
|
||||||
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
|
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
|
||||||
|
@ -35,7 +35,6 @@ post_build() {
|
||||||
local set=$1 spec=$2
|
local set=$1 spec=$2
|
||||||
|
|
||||||
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
|
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
|
||||||
|
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
netboot/netboot.spec)
|
netboot/netboot.spec)
|
||||||
mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
|
mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
|
||||||
|
@ -48,13 +47,14 @@ post_build() {
|
||||||
stage3-systemd.spec)
|
stage3-systemd.spec)
|
||||||
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
|
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
esac
|
||||||
|
popd >/dev/null
|
||||||
|
|
||||||
|
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
|
||||||
|
case ${spec} in
|
||||||
stage3-systemd-mu.spec)
|
stage3-systemd-mu.spec)
|
||||||
upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
*)
|
|
||||||
echo "Finished ${spec}"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
}
|
}
|
||||||
|
|
|
@ -20,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
|
||||||
update_symlinks() {
|
update_symlinks() {
|
||||||
# Symlink the latest stages3 to build from
|
# Symlink the latest stages3 to build from
|
||||||
local d f
|
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}"
|
mkdir -p "${d}"
|
||||||
pushd "${d}" >/dev/null
|
pushd "${d}" >/dev/null
|
||||||
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
|
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
|
||||||
|
@ -35,7 +35,6 @@ post_build() {
|
||||||
local set=$1 spec=$2
|
local set=$1 spec=$2
|
||||||
|
|
||||||
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
|
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
|
||||||
|
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
netboot/netboot.spec)
|
netboot/netboot.spec)
|
||||||
mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
|
mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
|
||||||
|
@ -48,13 +47,14 @@ post_build() {
|
||||||
stage3-systemd.spec)
|
stage3-systemd.spec)
|
||||||
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
|
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
esac
|
||||||
|
popd >/dev/null
|
||||||
|
|
||||||
|
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
|
||||||
|
case ${spec} in
|
||||||
stage3-systemd-mu.spec)
|
stage3-systemd-mu.spec)
|
||||||
upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
*)
|
|
||||||
echo "Finished ${spec}"
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
popd >/dev/null
|
popd >/dev/null
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue