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

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

4
releases/specs/hppa/hppa1.1/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: hppa1.1 subarch: hppa1.1
target: stage1 target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/hppa/17.0/systemd/merged-usr profile: default/linux/hppa/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-hppa1.1-systemd-mergedusr-latest source_subpath: mergedusr/stage3-hppa1.1-systemd-mergedusr-latest
update_seed: no update_seed: no
portage_confdir: @REPO_DIR@/releases/portage/stages portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng portage_prefix: releng

4
releases/specs/hppa/hppa1.1/stage3-systemd-mu.spec
View file

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

4
releases/specs/hppa/hppa2.0/stage1-systemd-mu.spec
View file

@ -1,10 +1,10 @@
subarch: hppa2.0 subarch: hppa2.0
target: stage1 target: stage1
version_stamp: systemd-mergedusr-@TIMESTAMP@ version_stamp: systemd-mergedusr-@TIMESTAMP@
rel_type: default rel_type: mergedusr
profile: default/linux/hppa/17.0/systemd/merged-usr profile: default/linux/hppa/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@ snapshot: @TIMESTAMP@
source_subpath: default/stage3-hppa2.0-systemd-mergedusr-latest source_subpath: mergedusr/stage3-hppa2.0-systemd-mergedusr-latest
update_seed: no update_seed: no
portage_confdir: @REPO_DIR@/releases/portage/stages portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng portage_prefix: releng

4
releases/specs/hppa/hppa2.0/stage3-systemd-mu.spec
View file

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

30
tools/catalyst-auto-hppa.conf
View file

@ -28,7 +28,7 @@ EMAIL_SUBJECT_PREPEND="[hppa-auto]"
update_symlinks() { update_symlinks() {
# Symlink the latest stages3 to build from # Symlink the latest stages3 to build from
local d f t local d f t
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
mkdir -p "${d}" mkdir -p "${d}"
pushd "${d}" >/dev/null pushd "${d}" >/dev/null
for t in hppa1.1 hppa2.0; do for t in hppa1.1 hppa2.0; do
@ -45,7 +45,6 @@ post_build() {
local set=$1 spec=$2 local set=$1 spec=$2
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in case ${spec} in
netboot-hppa32.spec) netboot-hppa32.spec)
mv netboot-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif mv netboot-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
@ -59,27 +58,28 @@ post_build() {
upload install-hppa-minimal-*${TIMESTAMP}*.iso* upload install-hppa-minimal-*${TIMESTAMP}*.iso*
;; ;;
hppa1.1/stage3-openrc.spec) hppa1.1/stage3-openrc.spec)
upload stage3-hppa1.1-openrc-*${TIMESTAMP}*.xz* upload stage3-hppa1.1-openrc-${TIMESTAMP}.xz*
;; ;;
hppa1.1/stage3-systemd.spec) hppa1.1/stage3-systemd.spec)
upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.xz* upload stage3-hppa1.1-systemd-${TIMESTAMP}.xz*
;;
hppa1.1/stage3-systemd-mu.spec)
upload stage3-hppa1.1-systemd-mergedusr-*${TIMESTAMP}*.xz*
;; ;;
hppa2.0/stage3-openrc.spec) hppa2.0/stage3-openrc.spec)
upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.xz* upload stage3-hppa2.0-openrc-${TIMESTAMP}.xz*
;; ;;
hppa2.0/stage3-systemd.spec) hppa2.0/stage3-systemd.spec)
upload stage3-hppa2.0-systemd-*${TIMESTAMP}*.xz* upload stage3-hppa2.0-systemd-${TIMESTAMP}.xz*
;;
hppa2.0/stage3-systemd-mu.spec)
upload stage3-hppa2.0-systemd-mergedusr-*${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
;; ;;
esac esac
popd >/dev/null
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
hppa1.1/stage3-systemd-mu.spec)
upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.xz*
;;
hppa2.0/stage3-systemd-mu.spec)
upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.xz*
;;
esac
popd >/dev/null popd >/dev/null
} }