amd64: move amd64 hardened-nomultilib to demeter
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
parent
c3a83e057f
commit
b891ceb599
|
@ -1,10 +1,10 @@
|
||||||
subarch: amd64
|
subarch: amd64
|
||||||
target: stage1
|
target: stage1
|
||||||
version_stamp: hardened+nomultilib-@TIMESTAMP@
|
version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@
|
||||||
rel_type: hardened
|
rel_type: hardened
|
||||||
profile: default/linux/amd64/17.1/no-multilib/hardened
|
profile: default/linux/amd64/17.1/no-multilib/hardened
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
|
source_subpath: hardened/stage3-amd64-hardened-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: hardened+nomultilib-@TIMESTAMP@
|
version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@
|
||||||
rel_type: hardened
|
rel_type: hardened
|
||||||
profile: default/linux/amd64/17.1/no-multilib/hardened
|
profile: default/linux/amd64/17.1/no-multilib/hardened
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: hardened/stage1-amd64-hardened+nomultilib-@TIMESTAMP@
|
source_subpath: hardened/stage1-amd64-hardened-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: hardened+nomultilib-@TIMESTAMP@
|
version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@
|
||||||
rel_type: hardened
|
rel_type: hardened
|
||||||
profile: default/linux/amd64/17.1/no-multilib/hardened
|
profile: default/linux/amd64/17.1/no-multilib/hardened
|
||||||
snapshot: @TIMESTAMP@
|
snapshot: @TIMESTAMP@
|
||||||
source_subpath: hardened/stage2-amd64-hardened+nomultilib-@TIMESTAMP@
|
source_subpath: hardened/stage2-amd64-hardened-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
|
|
@ -14,6 +14,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
|
||||||
|
|
||||||
SETS="
|
SETS="
|
||||||
hardened_openrc
|
hardened_openrc
|
||||||
|
hardened_nomultilib_openrc
|
||||||
nomultilib_openrc
|
nomultilib_openrc
|
||||||
nomultilib_systemd
|
nomultilib_systemd
|
||||||
musl
|
musl
|
||||||
|
@ -24,12 +25,11 @@ SETS="
|
||||||
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec"
|
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec"
|
||||||
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
|
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
|
||||||
|
|
||||||
|
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage2-openrc.spec hardened-nomultilib/stage3-openrc.spec"
|
||||||
|
|
||||||
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec"
|
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec"
|
||||||
SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage2-systemd.spec nomultilib/stage3-systemd.spec"
|
SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage2-systemd.spec nomultilib/stage3-systemd.spec"
|
||||||
|
|
||||||
##SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.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"
|
||||||
|
|
||||||
|
@ -85,6 +85,9 @@ post_build() {
|
||||||
hardened/admincd-stage2.spec)
|
hardened/admincd-stage2.spec)
|
||||||
upload admincd-amd64-${TIMESTAMP}.iso*
|
upload admincd-amd64-${TIMESTAMP}.iso*
|
||||||
;;
|
;;
|
||||||
|
hardened-nomultilib/stage3-openrc.spec)
|
||||||
|
upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
popd >/dev/null || exit
|
popd >/dev/null || exit
|
||||||
|
|
||||||
|
|
|
@ -14,7 +14,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
|
||||||
SETS="
|
SETS="
|
||||||
multilib minimal_multilib
|
multilib minimal_multilib
|
||||||
systemd
|
systemd
|
||||||
hardened_nomultilib minimal_hardened_nomultilib
|
|
||||||
hardened_multilib_selinux hardened_nomultilib_selinux
|
hardened_multilib_selinux hardened_nomultilib_selinux
|
||||||
"
|
"
|
||||||
|
|
||||||
|
@ -24,9 +23,6 @@ SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-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"
|
||||||
|
|
||||||
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
|
|
||||||
#SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
|
|
||||||
|
|
||||||
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
|
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
|
||||||
#SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
|
#SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
|
||||||
SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
|
SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
|
||||||
|
@ -84,12 +80,6 @@ post_build() {
|
||||||
hardened/stage4-minimal.spec)
|
hardened/stage4-minimal.spec)
|
||||||
upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
|
upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
hardened/stage3-nomultilib.spec)
|
|
||||||
upload stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
hardened/stage4-nomultilib-minimal.spec)
|
|
||||||
upload stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz*
|
|
||||||
;;
|
|
||||||
hardened/stage3-selinux.spec)
|
hardened/stage3-selinux.spec)
|
||||||
upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
|
upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
|
||||||
;;
|
;;
|
||||||
|
|
Loading…
Reference in a new issue