amd64: move nomultilib builds to demeter
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
parent
1fc5948cf5
commit
cf7151f6a9
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage1
|
target: stage1
|
||||||
version_stamp: nomultilib-@TIMESTAMP@
|
version_stamp: nomultilib-openrc-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/amd64/17.1/no-multilib
|
profile: default/linux/amd64/17.1/no-multilib
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage3-amd64-nomultilib-latest
|
source_subpath: default/stage3-amd64-nomultilib-openrc-latest
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
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: stage2
|
target: stage2
|
||||||
version_stamp: nomultilib-@TIMESTAMP@
|
version_stamp: nomultilib-openrc-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/amd64/17.1/no-multilib
|
profile: default/linux/amd64/17.1/no-multilib
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage1-amd64-nomultilib-@TIMESTAMP@
|
source_subpath: default/stage1-amd64-nomultilib-openrc-@TIMESTAMP@
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
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: stage3
|
target: stage3
|
||||||
version_stamp: nomultilib-@TIMESTAMP@
|
version_stamp: nomultilib-openrc-@TIMESTAMP@
|
||||||
rel_type: default
|
rel_type: default
|
||||||
profile: default/linux/amd64/17.1/no-multilib
|
profile: default/linux/amd64/17.1/no-multilib
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: default/stage2-amd64-nomultilib-@TIMESTAMP@
|
source_subpath: default/stage2-amd64-nomultilib-openrc-@TIMESTAMP@
|
||||||
compression_mode: pixz_x
|
compression_mode: pixz_x
|
||||||
portage_confdir: @REPO_DIR@/releases/portage/stages
|
portage_confdir: @REPO_DIR@/releases/portage/stages
|
||||||
portage_prefix: releng
|
portage_prefix: releng
|
|
@ -11,11 +11,16 @@ TYPE="auto"
|
||||||
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
|
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
|
||||||
|
|
||||||
SETS="
|
SETS="
|
||||||
|
nomultilib_openrc
|
||||||
musl
|
musl
|
||||||
musl_hardened
|
musl_hardened
|
||||||
x32_openrc
|
x32_openrc
|
||||||
"
|
"
|
||||||
|
|
||||||
|
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec"
|
||||||
|
|
||||||
|
##SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
|
||||||
|
|
||||||
SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
|
SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
|
||||||
SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
|
SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
|
||||||
|
|
||||||
|
@ -54,6 +59,9 @@ post_build() {
|
||||||
|
|
||||||
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
|
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
|
||||||
case ${spec} in
|
case ${spec} in
|
||||||
|
nomultilib/stage3-openrc.spec)
|
||||||
|
upload stage3-amd64-nomultilib-openrc-${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*
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -13,7 +13,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
|
||||||
|
|
||||||
SETS="
|
SETS="
|
||||||
multilib minimal_multilib
|
multilib minimal_multilib
|
||||||
nomultilib minimal_nomultilib
|
|
||||||
systemd
|
systemd
|
||||||
hardened_multilib minimal_hardened_multilib
|
hardened_multilib minimal_hardened_multilib
|
||||||
hardened_nomultilib minimal_hardened_nomultilib
|
hardened_nomultilib minimal_hardened_nomultilib
|
||||||
|
@ -23,8 +22,6 @@ SETS="
|
||||||
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
|
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
|
||||||
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
|
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
|
||||||
#SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
|
#SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
|
||||||
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
|
|
||||||
#SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
|
|
||||||
|
|
||||||
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
|
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
|
||||||
|
|
||||||
|
@ -79,18 +76,9 @@ post_build() {
|
||||||
stage4-minimal.spec)
|
stage4-minimal.spec)
|
||||||
upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
|
upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
stage3-nomultilib.spec)
|
|
||||||
upload stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
stage4-nomultilib-minimal.spec)
|
|
||||||
upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
stage3-systemd.spec)
|
stage3-systemd.spec)
|
||||||
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
stage3-x32.spec)
|
|
||||||
upload stage3-x32-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
popd >/dev/null || exit
|
popd >/dev/null || exit
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue