commit: 949bc0a212fe50d01a924e5810afe81c43f8d532
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 3 18:46:02 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 3 18:46:02 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=949bc0a2
x86: move i686 builds from demeter to pardalote
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs/x86/i686/{stage1.spec => stage1-openrc.spec} | 4 ++--
releases/specs/x86/i686/{stage2.spec => stage2-openrc.spec} | 4 ++--
releases/specs/x86/i686/{stage3.spec => stage3-openrc.spec} | 4 ++--
tools/catalyst-auto-x86-demeter.conf | 10 ++++++++++
tools/catalyst-auto-x86.conf | 6 ------
5 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/releases/specs/x86/i686/stage1.spec
b/releases/specs/x86/i686/stage1-openrc.spec
similarity index 76%
rename from releases/specs/x86/i686/stage1.spec
rename to releases/specs/x86/i686/stage1-openrc.spec
index e78be2e3..dd70d646 100644
--- a/releases/specs/x86/i686/stage1.spec
+++ b/releases/specs/x86/i686/stage1-openrc.spec
@@ -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
diff --git a/releases/specs/x86/i686/stage2.spec
b/releases/specs/x86/i686/stage2-openrc.spec
similarity index 69%
rename from releases/specs/x86/i686/stage2.spec
rename to releases/specs/x86/i686/stage2-openrc.spec
index 77aaa210..273a873a 100644
--- a/releases/specs/x86/i686/stage2.spec
+++ b/releases/specs/x86/i686/stage2-openrc.spec
@@ -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
diff --git a/releases/specs/x86/i686/stage3.spec
b/releases/specs/x86/i686/stage3-openrc.spec
similarity index 69%
rename from releases/specs/x86/i686/stage3.spec
rename to releases/specs/x86/i686/stage3-openrc.spec
index 6fbbb354..d5792523 100644
--- a/releases/specs/x86/i686/stage3.spec
+++ b/releases/specs/x86/i686/stage3-openrc.spec
@@ -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
diff --git a/tools/catalyst-auto-x86-demeter.conf
b/tools/catalyst-auto-x86-demeter.conf
index ab0fc7b6..6f16156f 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -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
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index d63c14c8..b19aa911 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -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"
