Move amd64 merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
parent
b9eeafab25
commit
e287f97a8c
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage1
|
target: stage1
|
||||||
version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
|
version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
|
||||||
rel_type: clang
|
rel_type: llvm-mergedusr
|
||||||
profile: default/linux/amd64/17.1/systemd/clang/merged-usr
|
profile: default/linux/amd64/17.1/systemd/clang/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: clang/stage3-amd64-llvm-systemd-mergedusr-latest
|
source_subpath: llvm-mergedusr/stage3-amd64-llvm-systemd-mergedusr-latest
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
update_seed: no
|
update_seed: no
|
||||||
update_seed_command: --update --deep --newuse @world
|
update_seed_command: --update --deep --newuse @world
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage3
|
target: stage3
|
||||||
version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
|
version_stamp: llvm-systemd-mergedusr-@TIMESTAMP@
|
||||||
rel_type: clang
|
rel_type: llvm-mergedusr
|
||||||
profile: default/linux/amd64/17.1/systemd/clang/merged-usr
|
profile: default/linux/amd64/17.1/systemd/clang/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: clang/stage1-amd64-llvm-systemd-mergedusr-@TIMESTAMP@
|
source_subpath: llvm-mergedusr/stage1-amd64-llvm-systemd-mergedusr-@TIMESTAMP@
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
portage_prefix: releng
|
portage_prefix: releng
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage1
|
target: stage1
|
||||||
version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@
|
version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr
|
profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-amd64-nomultilib-systemd-mergedusr-latest
|
source_subpath: mergedusr/stage3-amd64-nomultilib-systemd-mergedusr-latest
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
update_seed: no
|
update_seed: no
|
||||||
update_seed_command: --update --deep --newuse @world
|
update_seed_command: --update --deep --newuse @world
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage3
|
target: stage3
|
||||||
version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@
|
version_stamp: nomultilib-systemd-mergedusr-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr
|
profile: default/linux/amd64/17.1/no-multilib/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage1-amd64-nomultilib-systemd-mergedusr-@TIMESTAMP@
|
source_subpath: mergedusr/stage1-amd64-nomultilib-systemd-mergedusr-@TIMESTAMP@
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
portage_prefix: releng
|
portage_prefix: releng
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage1
|
target: stage1
|
||||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/amd64/17.1/systemd/merged-usr
|
profile: default/linux/amd64/17.1/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-amd64-systemd-mergedusr-latest
|
source_subpath: mergedusr/stage3-amd64-systemd-mergedusr-latest
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
update_seed: yes
|
update_seed: yes
|
||||||
update_seed_command: --update --deep --newuse @world
|
update_seed_command: --update --deep --newuse @world
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage3
|
target: stage3
|
||||||
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
version_stamp: systemd-mergedusr-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: mergedusr
|
||||||
profile: default/linux/amd64/17.1/systemd/merged-usr
|
profile: default/linux/amd64/17.1/systemd/merged-usr
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage1-amd64-systemd-mergedusr-@TIMESTAMP@
|
source_subpath: mergedusr/stage1-amd64-systemd-mergedusr-@TIMESTAMP@
|
||||||
compression_mode: pixz
|
compression_mode: pixz
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
portage_prefix: releng
|
portage_prefix: releng
|
||||||
|
|
|
@ -110,9 +110,6 @@ post_build() {
|
||||||
stage3-systemd.spec)
|
stage3-systemd.spec)
|
||||||
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
stage3-systemd-mu.spec)
|
|
||||||
upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
stage3d-openrc.spec)
|
stage3d-openrc.spec)
|
||||||
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
@ -128,9 +125,6 @@ post_build() {
|
||||||
nomultilib/stage3-systemd.spec)
|
nomultilib/stage3-systemd.spec)
|
||||||
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
nomultilib/stage3-systemd-mu.spec)
|
|
||||||
upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
x32/stage3-openrc.spec)
|
x32/stage3-openrc.spec)
|
||||||
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
|
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
@ -143,6 +137,17 @@ post_build() {
|
||||||
esac
|
esac
|
||||||
popd >/dev/null || exit
|
popd >/dev/null || exit
|
||||||
|
|
||||||
|
pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
|
||||||
|
case ${spec} in
|
||||||
|
stage3-systemd-mu.spec)
|
||||||
|
upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
||||||
|
;;
|
||||||
|
nomultilib/stage3-systemd-mu.spec)
|
||||||
|
upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
popd >/dev/null || exit
|
||||||
|
|
||||||
pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
|
pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
clang/stage3-openrc.spec)
|
clang/stage3-openrc.spec)
|
||||||
|
@ -151,6 +156,11 @@ post_build() {
|
||||||
clang/stage3-systemd.spec)
|
clang/stage3-systemd.spec)
|
||||||
upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
esac
|
||||||
|
popd >/dev/null || exit
|
||||||
|
|
||||||
|
pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
|
||||||
|
case ${spec} in
|
||||||
clang/stage3-systemd-mu.spec)
|
clang/stage3-systemd-mu.spec)
|
||||||
upload stage3-amd64-llvm-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-llvm-systemd-mergedusr-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in a new issue