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

Move amd64 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-23 00:22:21 +01:00
parent b9eeafab25
commit e287f97a8c
No known key found for this signature in database
GPG key ID: DC2B16215ED5412A
7 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs/amd64/clang/stage1-systemd-mu.spec
View file

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

4
releases/specs/amd64/clang/stage3-systemd-mu.spec
View file

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

4
releases/specs/amd64/nomultilib/stage1-systemd-mu.spec
View file

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

4
releases/specs/amd64/nomultilib/stage3-systemd-mu.spec
View file

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

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

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

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

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

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

@ -110,9 +110,6 @@ post_build() {
stage3-systemd.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
;;
stage3-systemd-mu.spec)
upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
stage3d-openrc.spec)
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
;;
@ -128,9 +125,6 @@ post_build() {
nomultilib/stage3-systemd.spec)
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
;;
nomultilib/stage3-systemd-mu.spec)
upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
@ -143,6 +137,17 @@ post_build() {
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
case ${spec} in
stage3-systemd-mu.spec)
upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
nomultilib/stage3-systemd-mu.spec)
upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
case ${spec} in
clang/stage3-openrc.spec)
@ -151,6 +156,11 @@ post_build() {
clang/stage3-systemd.spec)
upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
case ${spec} in
clang/stage3-systemd-mu.spec)
upload stage3-amd64-llvm-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;