* [gentoo-commits] proj/releng:master commit in: releases/specs-qemu/arm/armv6j/softfloat/, releases/specs-qemu/arm/armv7a/, ...
@ 2021-01-13 2:28 Andreas K. Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas K. Hüttel @ 2021-01-13 2:28 UTC (permalink / raw
To: gentoo-commits
loat-systemd.spec releases/specs-qemu/arm/armv7a/stage1-hardfloat.spec releases/specs-qemu/arm/armv7a/stage1-systemd.spec releases/specs-qemu/arm/armv7a/stage1.spec releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec releases/specs-qemu/arm/armv7a/stage2-systemd.spec releases/specs-qemu/arm/armv7a/stage2.spec releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec releases/specs-qemu/arm/armv7a/stage3-systemd.spec releases/specs-qemu/arm/armv7a/stage3.spec tools/catalyst-auto-qemu-arm.conf
X-VCS-Directories: releases/specs-qemu/arm/armv6j/softfloat/ releases/specs-qemu/arm/armv7a/softfloat/ releases/specs-qemu/arm/armv7a/ releases/specs-qemu/arm/armv6j/hardfloat/ releases/specs-qemu/arm/armv6j/ tools/ releases/specs-qemu/arm/armv7a/hardfloat/
X-VCS-Committer: dilfridge
X-VCS-Committer-Name: Andreas K. Hüttel
X-VCS-Revision: c9835278cc8a095edd1f556b5b01093ca2df24f1
X-VCS-Branch: master
Date: Wed, 13 Jan 2021 02:28:32 +0000 (UTC)
commit: c9835278cc8a095edd1f556b5b01093ca2df24f1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 02:27:45 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 02:27:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c9835278
Simplify qemu-arm specs directory structure
catalyst-auto seems to have trouble with second level subdirs
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...stage1-systemd.spec => stage1-hardfloat-systemd.spec} | 0
.../{hardfloat/stage1.spec => stage1-hardfloat.spec} | 0
.../arm/armv6j/{softfloat => }/stage1-systemd.spec | 0
.../specs-qemu/arm/armv6j/{softfloat => }/stage1.spec | 0
...stage2-systemd.spec => stage2-hardfloat-systemd.spec} | 0
.../{hardfloat/stage2.spec => stage2-hardfloat.spec} | 0
.../arm/armv6j/{softfloat => }/stage2-systemd.spec | 0
.../specs-qemu/arm/armv6j/{softfloat => }/stage2.spec | 0
...stage3-systemd.spec => stage3-hardfloat-systemd.spec} | 0
.../{hardfloat/stage3.spec => stage3-hardfloat.spec} | 0
.../arm/armv6j/{softfloat => }/stage3-systemd.spec | 0
.../specs-qemu/arm/armv6j/{softfloat => }/stage3.spec | 0
...stage1-systemd.spec => stage1-hardfloat-systemd.spec} | 0
.../{hardfloat/stage1.spec => stage1-hardfloat.spec} | 0
.../arm/armv7a/{softfloat => }/stage1-systemd.spec | 0
.../specs-qemu/arm/armv7a/{softfloat => }/stage1.spec | 0
...stage2-systemd.spec => stage2-hardfloat-systemd.spec} | 0
.../{hardfloat/stage2.spec => stage2-hardfloat.spec} | 0
.../arm/armv7a/{softfloat => }/stage2-systemd.spec | 0
.../specs-qemu/arm/armv7a/{softfloat => }/stage2.spec | 0
...stage3-systemd.spec => stage3-hardfloat-systemd.spec} | 0
.../{hardfloat/stage3.spec => stage3-hardfloat.spec} | 0
.../arm/armv7a/{softfloat => }/stage3-systemd.spec | 0
.../specs-qemu/arm/armv7a/{softfloat => }/stage3.spec | 0
tools/catalyst-auto-qemu-arm.conf | 16 ++++++++--------
25 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/releases/specs-qemu/arm/armv6j/hardfloat/stage1-systemd.spec b/releases/specs-qemu/arm/armv6j/stage1-hardfloat-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/hardfloat/stage1-systemd.spec
rename to releases/specs-qemu/arm/armv6j/stage1-hardfloat-systemd.spec
diff --git a/releases/specs-qemu/arm/armv6j/hardfloat/stage1.spec b/releases/specs-qemu/arm/armv6j/stage1-hardfloat.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/hardfloat/stage1.spec
rename to releases/specs-qemu/arm/armv6j/stage1-hardfloat.spec
diff --git a/releases/specs-qemu/arm/armv6j/softfloat/stage1-systemd.spec b/releases/specs-qemu/arm/armv6j/stage1-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/softfloat/stage1-systemd.spec
rename to releases/specs-qemu/arm/armv6j/stage1-systemd.spec
diff --git a/releases/specs-qemu/arm/armv6j/softfloat/stage1.spec b/releases/specs-qemu/arm/armv6j/stage1.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/softfloat/stage1.spec
rename to releases/specs-qemu/arm/armv6j/stage1.spec
diff --git a/releases/specs-qemu/arm/armv6j/hardfloat/stage2-systemd.spec b/releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/hardfloat/stage2-systemd.spec
rename to releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
diff --git a/releases/specs-qemu/arm/armv6j/hardfloat/stage2.spec b/releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/hardfloat/stage2.spec
rename to releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
diff --git a/releases/specs-qemu/arm/armv6j/softfloat/stage2-systemd.spec b/releases/specs-qemu/arm/armv6j/stage2-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/softfloat/stage2-systemd.spec
rename to releases/specs-qemu/arm/armv6j/stage2-systemd.spec
diff --git a/releases/specs-qemu/arm/armv6j/softfloat/stage2.spec b/releases/specs-qemu/arm/armv6j/stage2.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/softfloat/stage2.spec
rename to releases/specs-qemu/arm/armv6j/stage2.spec
diff --git a/releases/specs-qemu/arm/armv6j/hardfloat/stage3-systemd.spec b/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/hardfloat/stage3-systemd.spec
rename to releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
diff --git a/releases/specs-qemu/arm/armv6j/hardfloat/stage3.spec b/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/hardfloat/stage3.spec
rename to releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
diff --git a/releases/specs-qemu/arm/armv6j/softfloat/stage3-systemd.spec b/releases/specs-qemu/arm/armv6j/stage3-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/softfloat/stage3-systemd.spec
rename to releases/specs-qemu/arm/armv6j/stage3-systemd.spec
diff --git a/releases/specs-qemu/arm/armv6j/softfloat/stage3.spec b/releases/specs-qemu/arm/armv6j/stage3.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv6j/softfloat/stage3.spec
rename to releases/specs-qemu/arm/armv6j/stage3.spec
diff --git a/releases/specs-qemu/arm/armv7a/hardfloat/stage1-systemd.spec b/releases/specs-qemu/arm/armv7a/stage1-hardfloat-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/hardfloat/stage1-systemd.spec
rename to releases/specs-qemu/arm/armv7a/stage1-hardfloat-systemd.spec
diff --git a/releases/specs-qemu/arm/armv7a/hardfloat/stage1.spec b/releases/specs-qemu/arm/armv7a/stage1-hardfloat.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/hardfloat/stage1.spec
rename to releases/specs-qemu/arm/armv7a/stage1-hardfloat.spec
diff --git a/releases/specs-qemu/arm/armv7a/softfloat/stage1-systemd.spec b/releases/specs-qemu/arm/armv7a/stage1-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/softfloat/stage1-systemd.spec
rename to releases/specs-qemu/arm/armv7a/stage1-systemd.spec
diff --git a/releases/specs-qemu/arm/armv7a/softfloat/stage1.spec b/releases/specs-qemu/arm/armv7a/stage1.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/softfloat/stage1.spec
rename to releases/specs-qemu/arm/armv7a/stage1.spec
diff --git a/releases/specs-qemu/arm/armv7a/hardfloat/stage2-systemd.spec b/releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/hardfloat/stage2-systemd.spec
rename to releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
diff --git a/releases/specs-qemu/arm/armv7a/hardfloat/stage2.spec b/releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/hardfloat/stage2.spec
rename to releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
diff --git a/releases/specs-qemu/arm/armv7a/softfloat/stage2-systemd.spec b/releases/specs-qemu/arm/armv7a/stage2-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/softfloat/stage2-systemd.spec
rename to releases/specs-qemu/arm/armv7a/stage2-systemd.spec
diff --git a/releases/specs-qemu/arm/armv7a/softfloat/stage2.spec b/releases/specs-qemu/arm/armv7a/stage2.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/softfloat/stage2.spec
rename to releases/specs-qemu/arm/armv7a/stage2.spec
diff --git a/releases/specs-qemu/arm/armv7a/hardfloat/stage3-systemd.spec b/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/hardfloat/stage3-systemd.spec
rename to releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
diff --git a/releases/specs-qemu/arm/armv7a/hardfloat/stage3.spec b/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/hardfloat/stage3.spec
rename to releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
diff --git a/releases/specs-qemu/arm/armv7a/softfloat/stage3-systemd.spec b/releases/specs-qemu/arm/armv7a/stage3-systemd.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/softfloat/stage3-systemd.spec
rename to releases/specs-qemu/arm/armv7a/stage3-systemd.spec
diff --git a/releases/specs-qemu/arm/armv7a/softfloat/stage3.spec b/releases/specs-qemu/arm/armv7a/stage3.spec
similarity index 100%
rename from releases/specs-qemu/arm/armv7a/softfloat/stage3.spec
rename to releases/specs-qemu/arm/armv7a/stage3.spec
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 9326d336..a52005d8 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -27,15 +27,15 @@ SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage2-systemd.sp
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_armv6j_hf_SPECS="armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage2.spec armv6j/hardfloat/stage3.spec"
-SET_armv6j_sf_SPECS="armv6j/softfloat/stage1.spec armv6j/softfloat/stage2.spec armv6j/softfloat/stage3.spec"
-SET_armv6j_hf_systemd_SPECS="armv6j/hardfloat/stage1-systemd.spec armv6j/hardfloat/stage2-systemd.spec armv6j/hardfloat/stage3-systemd.spec"
-SET_armv6j_sf_systemd_SPECS="armv6j/softfloat/stage1-systemd.spec armv6j/softfloat/stage2-systemd.spec armv6j/softfloat/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_armv7a_hf_SPECS="armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage2.spec armv7a/hardfloat/stage3.spec"
-SET_armv7a_sf_SPECS="armv7a/softfloat/stage1.spec armv7a/softfloat/stage2.spec armv7a/softfloat/stage3.spec"
-SET_armv7a_hf_systemd_SPECS="armv7a/hardfloat/stage1-systemd.spec armv7a/hardfloat/stage2-systemd.spec armv7a/hardfloat/stage3-systemd.spec"
-SET_armv7a_sf_systemd_SPECS="armv7a/softfloat/stage1-systemd.spec armv7a/softfloat/stage2-systemd.spec armv7a/softfloat/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"
update_symlinks() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-01-13 2:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-01-13 2:28 [gentoo-commits] proj/releng:master commit in: releases/specs-qemu/arm/armv6j/softfloat/, releases/specs-qemu/arm/armv7a/, Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox