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

amd64: move hardened multilib 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-09 22:00:57 +02:00
parent a64a79c3da
commit cf6f590d35
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
6 changed files with 29 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
releases/specs/amd64/hardened/admincd-stage1.spec
View file

@ -4,7 +4,7 @@ target: livecd-stage1
rel_type: hardened
profile: default/linux/amd64/17.1/hardened
snapshot: @TIMESTAMP@
source_subpath: hardened/stage3-amd64-hardened-@TIMESTAMP@
source_subpath: hardened/stage3-amd64-hardened-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/isos

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

@ -1,10 +1,10 @@
subarch: amd64
target: stage1
version_stamp: hardened-@TIMESTAMP@
version_stamp: hardened-openrc-@TIMESTAMP@
rel_type: hardened
profile: default/linux/amd64/17.1/hardened
snapshot: @TIMESTAMP@
source_subpath: hardened/stage3-amd64-hardened-latest
source_subpath: hardened/stage3-amd64-hardened-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: --update --deep --newuse @world

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

@ -1,10 +1,10 @@
subarch: amd64
target: stage2
version_stamp: hardened-@TIMESTAMP@
version_stamp: hardened-openrc-@TIMESTAMP@
rel_type: hardened
profile: default/linux/amd64/17.1/hardened
snapshot: @TIMESTAMP@
source_subpath: hardened/stage1-amd64-hardened-@TIMESTAMP@
source_subpath: hardened/stage1-amd64-hardened-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng

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

@ -1,10 +1,10 @@
subarch: amd64
target: stage3
version_stamp: hardened-@TIMESTAMP@
version_stamp: hardened-openrc-@TIMESTAMP@
rel_type: hardened
profile: default/linux/amd64/17.1/hardened
snapshot: @TIMESTAMP@
source_subpath: hardened/stage2-amd64-hardened-@TIMESTAMP@
source_subpath: hardened/stage2-amd64-hardened-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng

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

@ -8,17 +8,26 @@ host=$(hostname)
ARCH="amd64"
TYPE="auto"
EMAIL_SUBJECT_PREPEND="[amd64-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
hardened_openrc
nomultilib_openrc
nomultilib_systemd
musl
musl_hardened
x32_openrc
"
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/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_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_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"
@ -32,7 +41,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,musl,musl-hardened} ; do
for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,musl-hardened} ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@ -68,6 +77,17 @@ post_build() {
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2.spec)
upload admincd-amd64-${TIMESTAMP}.iso*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)

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

@ -14,7 +14,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
multilib minimal_multilib
systemd
hardened_multilib minimal_hardened_multilib
hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
@ -25,9 +24,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_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
#SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.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"
@ -85,12 +81,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in
hardened/stage3.spec)
upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2.spec)
upload admincd-amd64-${TIMESTAMP}.iso*
;;
hardened/stage4-minimal.spec)
upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
;;