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() {