chadmed/gentoo-asahi-releng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

amd64: move selinux builds to demeter

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2021-07-10 19:53:46 +02:00
parent 91376d48df
commit 7189beaa5b
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
8 changed files with 28 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs/amd64/hardened/stage1-selinux-nomultilib.spec → releases/specs/amd64/hardened-nomultilib-selinux/stage1-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: amd64 subarch: amd64
target: stage1 target: stage1
version_stamp: hardened-selinux+nomultilib-@TIMESTAMP@ version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@
rel_type: hardened rel_type: hardened
profile: default/linux/amd64/17.1/no-multilib/hardened/selinux profile: default/linux/amd64/17.1/no-multilib/hardened/selinux
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: hardened/stage3-amd64-hardened-selinux+nomultilib-latest source_subpath: hardened/stage3-amd64-hardened-nomultilib-selinux-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

4
releases/specs/amd64/hardened/stage2-selinux-nomultilib.spec → releases/specs/amd64/hardened-nomultilib-selinux/stage2-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: amd64 subarch: amd64
target: stage2 target: stage2
version_stamp: hardened-selinux+nomultilib-@TIMESTAMP@ version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@
rel_type: hardened rel_type: hardened
profile: default/linux/amd64/17.1/no-multilib/hardened/selinux profile: default/linux/amd64/17.1/no-multilib/hardened/selinux
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: hardened/stage1-amd64-hardened-selinux+nomultilib-@TIMESTAMP@ source_subpath: hardened/stage1-amd64-hardened-nomultilib-selinux-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

4
releases/specs/amd64/hardened/stage3-selinux-nomultilib.spec → releases/specs/amd64/hardened-nomultilib-selinux/stage3-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: amd64 subarch: amd64
target: stage3 target: stage3
version_stamp: hardened-selinux+nomultilib-@TIMESTAMP@ version_stamp: hardened-nomultilib-selinux-openrc-@TIMESTAMP@
rel_type: hardened rel_type: hardened
profile: default/linux/amd64/17.1/no-multilib/hardened/selinux profile: default/linux/amd64/17.1/no-multilib/hardened/selinux
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: hardened/stage2-amd64-hardened-selinux+nomultilib-@TIMESTAMP@ source_subpath: hardened/stage2-amd64-hardened-nomultilib-selinux-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

4
releases/specs/amd64/hardened/stage1-selinux.spec → releases/specs/amd64/hardened-selinux/stage1-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: amd64 subarch: amd64
target: stage1 target: stage1
version_stamp: hardened-selinux-@TIMESTAMP@ version_stamp: hardened-selinux-openrc-@TIMESTAMP@
rel_type: hardened rel_type: hardened
profile: default/linux/amd64/17.1/hardened/selinux profile: default/linux/amd64/17.1/hardened/selinux
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: hardened/stage3-amd64-hardened-selinux-latest source_subpath: hardened/stage3-amd64-hardened-selinux-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

4
releases/specs/amd64/hardened/stage2-selinux.spec → releases/specs/amd64/hardened-selinux/stage2-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: amd64 subarch: amd64
target: stage2 target: stage2
version_stamp: hardened-selinux-@TIMESTAMP@ version_stamp: hardened-selinux-openrc-@TIMESTAMP@
rel_type: hardened rel_type: hardened
profile: default/linux/amd64/17.1/hardened/selinux profile: default/linux/amd64/17.1/hardened/selinux
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: hardened/stage1-amd64-hardened-selinux-@TIMESTAMP@ source_subpath: hardened/stage1-amd64-hardened-selinux-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

4
releases/specs/amd64/hardened/stage3-selinux.spec → releases/specs/amd64/hardened-selinux/stage3-openrc.spec
View file

@ -1,10 +1,10 @@
subarch: amd64 subarch: amd64
target: stage3 target: stage3
version_stamp: hardened-selinux-@TIMESTAMP@ version_stamp: hardened-selinux-openrc-@TIMESTAMP@
rel_type: hardened rel_type: hardened
profile: default/linux/amd64/17.1/hardened/selinux profile: default/linux/amd64/17.1/hardened/selinux
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: hardened/stage2-amd64-hardened-selinux-@TIMESTAMP@ source_subpath: hardened/stage2-amd64-hardened-selinux-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

16
tools/catalyst-auto-amd64-demeter.conf
View file

@ -15,10 +15,12 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS=" SETS="
openrc openrc
systemd systemd
hardened_openrc
hardened_nomultilib_openrc
nomultilib_openrc nomultilib_openrc
nomultilib_systemd nomultilib_systemd
hardened_openrc
hardened_nomultilib_openrc
hardened_selinux_openrc
hardened_nomultilib_selinux_openrc
musl musl
musl_hardened musl_hardened
x32_openrc x32_openrc
@ -31,6 +33,10 @@ SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
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_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage2-openrc.spec hardened-selinux/stage3-openrc.spec"
SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec hardened-nomultilib-selinux/stage2-openrc.spec hardened-nomultilib-selinux/stage3-openrc.spec"
SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage2-openrc.spec hardened-nomultilib/stage3-openrc.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"
@ -103,6 +109,12 @@ post_build() {
hardened-nomultilib/stage3-openrc.spec) hardened-nomultilib/stage3-openrc.spec)
upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz* upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;; ;;
hardened-selinux/stage3-openrc.spec)
upload stage3-amd64-hardened-selinux-openrc-${TIMESTAMP}.tar.xz*
;;
hardened-nomultilib-selinux/stage3-openrc.spec)
upload stage3-amd64-hardened-nomultilib-selinux-openrc-${TIMESTAMP}.tar.xz*
;;
esac esac
popd >/dev/null || exit popd >/dev/null || exit

18
tools/catalyst-auto-amd64.conf
View file

@ -11,13 +11,8 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/amd64 SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS=" SETS=""
hardened_multilib_selinux hardened_nomultilib_selinux SPECS="nosuchfile.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_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
@ -54,15 +49,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-selinux.spec)
upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2-selinux.spec)
upload admincd-amd64-${TIMESTAMP}.iso*
;;
hardened/stage3-selinux-nomultilib.spec)
upload stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz*
;;
esac esac
popd >/dev/null || exit popd >/dev/null || exit
} }