Simplify qemu-arm specs directory structure

catalyst-auto seems to have trouble with second level subdirs Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>
2021-01-13 04:27:45 +02:00 · 2021-01-13 04:27:45 +02:00 · c9835278cc
parent bb1e7293ac
commit c9835278cc
25 changed files with 8 additions and 8 deletions
--- a/releases/specs-qemu/arm/armv6j/stage1-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/stage1-hardfloat-systemd.spec
--- a/releases/specs-qemu/arm/armv6j/stage1-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv6j/stage1-hardfloat.spec
--- a/releases/specs-qemu/arm/armv6j/softfloat/stage1-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/softfloat/stage1-systemd.spec
--- a/releases/specs-qemu/arm/armv6j/softfloat/stage1.spec
+++ b/releases/specs-qemu/arm/armv6j/softfloat/stage1.spec
--- a/releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/stage2-hardfloat-systemd.spec
--- a/releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv6j/stage2-hardfloat.spec
--- a/releases/specs-qemu/arm/armv6j/softfloat/stage2-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/softfloat/stage2-systemd.spec
--- a/releases/specs-qemu/arm/armv6j/softfloat/stage2.spec
+++ b/releases/specs-qemu/arm/armv6j/softfloat/stage2.spec
--- a/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/stage3-hardfloat-systemd.spec
--- a/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv6j/stage3-hardfloat.spec
--- a/releases/specs-qemu/arm/armv6j/softfloat/stage3-systemd.spec
+++ b/releases/specs-qemu/arm/armv6j/softfloat/stage3-systemd.spec
--- a/releases/specs-qemu/arm/armv6j/softfloat/stage3.spec
+++ b/releases/specs-qemu/arm/armv6j/softfloat/stage3.spec
--- a/releases/specs-qemu/arm/armv7a/stage1-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/stage1-hardfloat-systemd.spec
--- a/releases/specs-qemu/arm/armv7a/stage1-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv7a/stage1-hardfloat.spec
--- a/releases/specs-qemu/arm/armv7a/softfloat/stage1-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/softfloat/stage1-systemd.spec
--- a/releases/specs-qemu/arm/armv7a/softfloat/stage1.spec
+++ b/releases/specs-qemu/arm/armv7a/softfloat/stage1.spec
--- a/releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/stage2-hardfloat-systemd.spec
--- a/releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv7a/stage2-hardfloat.spec
--- a/releases/specs-qemu/arm/armv7a/softfloat/stage2-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/softfloat/stage2-systemd.spec
--- a/releases/specs-qemu/arm/armv7a/softfloat/stage2.spec
+++ b/releases/specs-qemu/arm/armv7a/softfloat/stage2.spec
--- a/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/stage3-hardfloat-systemd.spec
--- a/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
+++ b/releases/specs-qemu/arm/armv7a/stage3-hardfloat.spec
--- a/releases/specs-qemu/arm/armv7a/softfloat/stage3-systemd.spec
+++ b/releases/specs-qemu/arm/armv7a/softfloat/stage3-systemd.spec
--- a/releases/specs-qemu/arm/armv7a/softfloat/stage3.spec
+++ b/releases/specs-qemu/arm/armv7a/softfloat/stage3.spec
--- 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() {