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

Move x86 merged-usr builds to separate build types

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2022-11-25 15:37:27 +01:00
parent 29221be892
commit 0f125915c6
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs/x86/i686/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: i686 subarch: i686
target: stage1 target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/x86/17.0/systemd/merged-usr profile: default/linux/x86/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-i686-systemd-mergedusr-latest source_subpath: mergedusr/stage3-i686-systemd-mergedusr-latest
compression_mode: pixz compression_mode: pixz
update_seed: no update_seed: no
update_seed_command: --update --deep --newuse @world update_seed_command: --update --deep --newuse @world

4
releases/specs/x86/i686/stage3-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: i686 subarch: i686
target: stage3 target: stage3
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/x86/17.0/systemd/merged-usr profile: default/linux/x86/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage1-i686-systemd-mergedusr-@TIMESTAMP@ source_subpath: mergedusr/stage1-i686-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng portage_prefix: releng

7
tools/catalyst-auto-x86.conf
View file

@ -39,7 +39,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() { update_symlinks() {
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl} ; do for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,mergedusr} ; do
mkdir -p "${d}" mkdir -p "${d}"
pushd "${d}" >/dev/null || exit pushd "${d}" >/dev/null || exit
shopt -s extglob shopt -s extglob
@ -80,6 +80,11 @@ post_build() {
i686/stage3-systemd.spec) i686/stage3-systemd.spec)
upload stage3-i686-systemd-${TIMESTAMP}.tar.xz* upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
;; ;;
esac
popd >/dev/null || exit
pushd ${BUILD_SRCDIR_BASE}/builds/mergedusr >/dev/null || exit
case ${spec} in
i686/stage3-systemd-mu.spec) i686/stage3-systemd-mu.spec)
upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz* upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;; ;;