commit: 683c6a1a41f8a592bac55dc766bbe56af26411bb
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 17 21:05:01 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 17 21:05:01 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=683c6a1a
qemu/arm: Build stage3 from stage1
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../specs-qemu/arm/armv4tl/stage2-systemd.spec | 11 ----
releases/specs-qemu/arm/armv4tl/stage2.spec | 11 ----
.../specs-qemu/arm/armv4tl/stage3-systemd.spec | 2 +-
releases/specs-qemu/arm/armv4tl/stage3.spec | 2 +-
.../specs-qemu/arm/armv5tel/stage2-systemd.spec | 11 ----
releases/specs-qemu/arm/armv5tel/stage2.spec | 11 ----
.../specs-qemu/arm/armv5tel/stage3-systemd.spec | 2 +-
releases/specs-qemu/arm/armv5tel/stage3.spec | 2 +-
.../arm/armv6j/stage2-hardfloat-systemd.spec | 11 ----
.../specs-qemu/arm/armv6j/stage2-hardfloat.spec | 11 ----
releases/specs-qemu/arm/armv6j/stage2-systemd.spec | 11 ----
releases/specs-qemu/arm/armv6j/stage2.spec | 11 ----
.../arm/armv6j/stage3-hardfloat-systemd.spec | 2 +-
.../specs-qemu/arm/armv6j/stage3-hardfloat.spec | 2 +-
releases/specs-qemu/arm/armv6j/stage3-systemd.spec | 2 +-
releases/specs-qemu/arm/armv6j/stage3.spec | 2 +-
.../arm/armv7a/stage2-hardfloat-systemd.spec | 11 ----
.../specs-qemu/arm/armv7a/stage2-hardfloat.spec | 11 ----
releases/specs-qemu/arm/armv7a/stage2-systemd.spec | 11 ----
releases/specs-qemu/arm/armv7a/stage2.spec | 11 ----
.../arm/armv7a/stage3-hardfloat-systemd.spec | 2 +-
.../specs-qemu/arm/armv7a/stage3-hardfloat.spec | 2 +-
releases/specs-qemu/arm/armv7a/stage3-systemd.spec | 2 +-
releases/specs-qemu/arm/armv7a/stage3.spec | 2 +-
tools/catalyst-auto-qemu-arm.conf | 61 ++++++++++++++++------
25 files changed, 56 insertions(+), 161 deletions(-)
diff --git a/releases/specs-qemu/arm/armv4tl/stage2-systemd.spec
b/releases/specs-qemu/arm/armv4tl/stage2-systemd.spec
deleted file mode 100644
index 10fd5af4..00000000
--- a/releases/specs-qemu/arm/armv4tl/stage2-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv4tl
-version_stamp: systemd-@TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv4t/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv4tl-systemd-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv4tl/stage2.spec
b/releases/specs-qemu/arm/armv4tl/stage2.spec
deleted file mode 100644
index f5289263..00000000
--- a/releases/specs-qemu/arm/armv4tl/stage2.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv4tl
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv4t
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv4tl-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv4tl/stage3-systemd.spec
b/releases/specs-qemu/arm/armv4tl/stage3-systemd.spec
index 9f96ce75..28658c65 100644
--- a/releases/specs-qemu/arm/armv4tl/stage3-systemd.spec
+++ b/releases/specs-qemu/arm/armv4tl/stage3-systemd.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv4t/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv4tl-systemd-@TIMESTAMP@
+source_subpath: default/stage1-armv4tl-systemd-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv4tl/stage3.spec
b/releases/specs-qemu/arm/armv4tl/stage3.spec
index f7b69a6e..a6136b96 100644
--- a/releases/specs-qemu/arm/armv4tl/stage3.spec
+++ b/releases/specs-qemu/arm/armv4tl/stage3.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv4t
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv4tl-@TIMESTAMP@
+source_subpath: default/stage1-armv4tl-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv5tel/stage2-systemd.spec
b/releases/specs-qemu/arm/armv5tel/stage2-systemd.spec
deleted file mode 100644
index cecae372..00000000
--- a/releases/specs-qemu/arm/armv5tel/stage2-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv5tel
-version_stamp: systemd-@TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv5te/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv5tel-systemd-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv5tel/stage2.spec
b/releases/specs-qemu/arm/armv5tel/stage2.spec
deleted file mode 100644
index 8256c166..00000000
--- a/releases/specs-qemu/arm/armv5tel/stage2.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv5tel
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv5te
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv5tel-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv5tel/stage3-systemd.spec
b/releases/specs-qemu/arm/armv5tel/stage3-systemd.spec
index 0c2d13e5..6660d779 100644
--- a/releases/specs-qemu/arm/armv5tel/stage3-systemd.spec
+++ b/releases/specs-qemu/arm/armv5tel/stage3-systemd.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv5te/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv5tel-systemd-@TIMESTAMP@
+source_subpath: default/stage1-armv5tel-systemd-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv5tel/stage3.spec
b/releases/specs-qemu/arm/armv5tel/stage3.spec
index b5631512..cc22f0ba 100644
--- a/releases/specs-qemu/arm/armv5tel/stage3.spec
+++ b/releases/specs-qemu/arm/armv5tel/stage3.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv5te
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv5tel-@TIMESTAMP@
+source_subpath: default/stage1-armv5tel-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
b/releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
deleted file mode 100644
index ba1248d1..00000000
--- a/releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv6j_hardfp
-version_stamp: systemd-@TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv6j/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j_hardfp-systemd-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
b/releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
deleted file mode 100644
index 41976b13..00000000
--- a/releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv6j_hardfp
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv6j
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j_hardfp-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv6j/stage2-systemd.spec
b/releases/specs-qemu/arm/armv6j/stage2-systemd.spec
deleted file mode 100644
index de74a799..00000000
--- a/releases/specs-qemu/arm/armv6j/stage2-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv6j
-version_stamp: systemd-@TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv6j/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j-systemd-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv6j/stage2.spec
b/releases/specs-qemu/arm/armv6j/stage2.spec
deleted file mode 100644
index 8ab7d34c..00000000
--- a/releases/specs-qemu/arm/armv6j/stage2.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv6j
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv6j
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv6j-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
b/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
index 34de313c..9d722435 100644
--- a/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv6j/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv6j_hardfp-systemd-@TIMESTAMP@
+source_subpath: default/stage1-armv6j_hardfp-systemd-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
b/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
index faca260f..a2f22ae5 100644
--- a/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv6j
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv6j_hardfp-@TIMESTAMP@
+source_subpath: default/stage1-armv6j_hardfp-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv6j/stage3-systemd.spec
b/releases/specs-qemu/arm/armv6j/stage3-systemd.spec
index 74982607..6c677793 100644
--- a/releases/specs-qemu/arm/armv6j/stage3-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/stage3-systemd.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv6j/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv6j-systemd-@TIMESTAMP@
+source_subpath: default/stage1-armv6j-systemd-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv6j/stage3.spec
b/releases/specs-qemu/arm/armv6j/stage3.spec
index 9c96f3ff..7373a821 100644
--- a/releases/specs-qemu/arm/armv6j/stage3.spec
+++ b/releases/specs-qemu/arm/armv6j/stage3.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv6j
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv6j-@TIMESTAMP@
+source_subpath: default/stage1-armv6j-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
b/releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
deleted file mode 100644
index 84f62c5b..00000000
--- a/releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv7a_hardfp
-version_stamp: systemd-@TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv7a/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a_hardfp-systemd-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
b/releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
deleted file mode 100644
index aad88270..00000000
--- a/releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv7a_hardfp
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv7a
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a_hardfp-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv7a/stage2-systemd.spec
b/releases/specs-qemu/arm/armv7a/stage2-systemd.spec
deleted file mode 100644
index 505f3ce7..00000000
--- a/releases/specs-qemu/arm/armv7a/stage2-systemd.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv7a
-version_stamp: systemd-@TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv7a/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a-systemd-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv7a/stage2.spec
b/releases/specs-qemu/arm/armv7a/stage2.spec
deleted file mode 100644
index 751621b9..00000000
--- a/releases/specs-qemu/arm/armv7a/stage2.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: armv7a
-version_stamp: @TIMESTAMP@
-target: stage2
-rel_type: default
-profile: default/linux/arm/17.0/armv7a
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-armv7a-@TIMESTAMP@
-compression_mode: pixz_x
-portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
-portage_prefix: releng
-interpreter: /usr/bin/qemu-arm
diff --git a/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
b/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
index 187338b4..76b6cf36 100644
--- a/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv7a/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv7a_hardfp-systemd-@TIMESTAMP@
+source_subpath: default/stage1-armv7a_hardfp-systemd-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
b/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
index 407f2936..00fd4842 100644
--- a/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv7a
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv7a_hardfp-@TIMESTAMP@
+source_subpath: default/stage1-armv7a_hardfp-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv7a/stage3-systemd.spec
b/releases/specs-qemu/arm/armv7a/stage3-systemd.spec
index 7b2fcadd..13ffab28 100644
--- a/releases/specs-qemu/arm/armv7a/stage3-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/stage3-systemd.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv7a/systemd
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv7a-systemd-@TIMESTAMP@
+source_subpath: default/stage1-armv7a-systemd-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/releases/specs-qemu/arm/armv7a/stage3.spec
b/releases/specs-qemu/arm/armv7a/stage3.spec
index cb040688..14537bc3 100644
--- a/releases/specs-qemu/arm/armv7a/stage3.spec
+++ b/releases/specs-qemu/arm/armv7a/stage3.spec
@@ -4,7 +4,7 @@ target: stage3
rel_type: default
profile: default/linux/arm/17.0/armv7a
snapshot: @TIMESTAMP@
-source_subpath: default/stage2-armv7a-@TIMESTAMP@
+source_subpath: default/stage1-armv7a-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/tools/catalyst-auto-qemu-arm.conf
b/tools/catalyst-auto-qemu-arm.conf
index dd3c293d..148ebe90 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -21,21 +21,21 @@ SETS="
armv7a_sf_systemd
"
-SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage2.spec armv4tl/stage3.spec"
-SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec
armv4tl/stage2-systemd.spec armv4tl/stage3-systemd.spec"
+SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
+SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec
armv4tl/stage3-systemd.spec"
-SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage2.spec
armv5tel/stage3.spec"
-SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec
armv5tel/stage2-systemd.spec armv5tel/stage3-systemd.spec"
+SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec"
+SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec
armv5tel/stage3-systemd.spec"
-SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage2-hardfloat.spec
armv6j/stage3-hardfloat.spec"
-SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage2.spec armv6j/stage3.spec"
-SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec
armv6j/stage2-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec"
-SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec
armv6j/stage2-systemd.spec armv6j/stage3-systemd.spec"
+SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec"
+SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec"
+SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec
armv6j/stage3-hardfloat-systemd.spec"
+SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec
armv6j/stage3-systemd.spec"
-SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage2-hardfloat.spec
armv7a/stage3-hardfloat.spec"
-SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage2.spec armv7a/stage3.spec"
-SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec
armv7a/stage2-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
-SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec
armv7a/stage2-systemd.spec armv7a/stage3-systemd.spec"
+SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec"
+SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec"
+SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec
armv7a/stage3-hardfloat-systemd.spec"
+SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec
armv7a/stage3-systemd.spec"
update_symlinks() {
@@ -55,6 +55,9 @@ upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o
VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@"
[email protected]:
+ else
+ echo Would now upload "$@"
+ ls -l $@
fi
}
@@ -67,14 +70,38 @@ post_build() {
armv4tl/stage3.spec)
upload stage3-armv4tl-${TIMESTAMP}*.xz*
;;
- armv5tel/systemd-stage3.spec)
+ armv4tl/stage3-systemd.spec)
+ upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3.spec)
+ upload stage3-armv5tel-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3-systemd.spec)
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
;;
- armv6j_hardfp/stage3.spec)
- upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+ armv6j/stage3.spec)
+ upload stage3-armv6j-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-systemd.spec)
+ upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat.spec)
+ upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat-systemd.spec)
+ upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3.spec)
+ upload stage3-armv7a-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-systemd.spec)
+ upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-hardfloat.spec)
+ upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
;;
- armv7a_hardfp/stage3.spec)
- upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+ armv7a/stage3-hardfloat-systemd.spec)
+ upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
;;
esac
