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

amd64: move "normal" 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-10 19:28:33 +02:00
parent b891ceb599
commit 91376d48df
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
13 changed files with 21 additions and 754 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,6 +13,8 @@ EMAIL_SUBJECT_PREPEND="[amd64-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
openrc
systemd
hardened_openrc
hardened_nomultilib_openrc
nomultilib_openrc
@ -22,6 +24,10 @@ SETS="
x32_openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
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_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
@ -68,6 +74,15 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
case ${spec} in
stage3-openrc.spec)
upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-systemd.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
nomultilib/stage3-openrc.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;;

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

@ -12,17 +12,9 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
multilib minimal_multilib
systemd
hardened_multilib_selinux hardened_nomultilib_selinux
"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
#SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.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"
@ -56,24 +48,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
upload stage3-amd64-${TIMESTAMP}.tar.xz*
;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
stage4-minimal.spec)
upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
;;
stage3-systemd.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in