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

x86: move i686 builds from demeter to pardalote

Browse source 
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
This commit is contained in:
Andreas K. Hüttel 2021-07-03 20:46:02 +02:00
parent fc700b0e62
commit 949bc0a212
No known key found for this signature in database
GPG key ID: 4C49F79E54D0A206
5 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
releases/specs/x86/i686/stage1.spec → releases/specs/x86/i686/stage1-openrc.spec
View file

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

4
releases/specs/x86/i686/stage2.spec → releases/specs/x86/i686/stage2-openrc.spec
View file

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

4
releases/specs/x86/i686/stage3.spec → releases/specs/x86/i686/stage3-openrc.spec
View file

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

10
tools/catalyst-auto-x86-demeter.conf
View file

@ -12,11 +12,15 @@ SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
i486_openrc
i686_openrc
i686_systemd
"
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec"
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec"
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage2-openrc.spec i686/stage3-openrc.spec"
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
@ -56,6 +60,12 @@ post_build() {
i486/installcd-stage2-minimal-openrc.spec)
upload install-x86-minimal-openrc-${TIMESTAMP}.iso*
;;
i686/stage3-openrc.spec)
upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
;;
i686/stage3-systemd.spec)
upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
}

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

@ -12,15 +12,9 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
i686
i686_systemd
hardened
"
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"