From 006fc1f0470abce0c2f8f4df4f4a339fa1c4d551 Mon Sep 17 00:00:00 2001 From: "Jorge Manuel B. S. Vicetto (jmbsvicetto)" Date: Fri, 18 Dec 2015 00:53:56 -0100 Subject: [PATCH] Rename the stage4 to "cloud" in case we decide to add more stage4 later. Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) --- .../hardened/{stage4.spec => stage4-cloud.spec} | 0 ...omultilib.spec => stage4-nomultilib-cloud.spec} | 0 .../specs/amd64/{stage4.spec => stage4-cloud.spec} | 0 ...omultilib.spec => stage4-nomultilib-cloud.spec} | 0 tools/catalyst-auto-amd64.conf | 14 ++++++++------ 5 files changed, 8 insertions(+), 6 deletions(-) rename releases/weekly/specs/amd64/hardened/{stage4.spec => stage4-cloud.spec} (100%) rename releases/weekly/specs/amd64/hardened/{stage4-nomultilib.spec => stage4-nomultilib-cloud.spec} (100%) rename releases/weekly/specs/amd64/{stage4.spec => stage4-cloud.spec} (100%) rename releases/weekly/specs/amd64/{stage4-nomultilib.spec => stage4-nomultilib-cloud.spec} (100%) diff --git a/releases/weekly/specs/amd64/hardened/stage4.spec b/releases/weekly/specs/amd64/hardened/stage4-cloud.spec similarity index 100% rename from releases/weekly/specs/amd64/hardened/stage4.spec rename to releases/weekly/specs/amd64/hardened/stage4-cloud.spec diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec similarity index 100% rename from releases/weekly/specs/amd64/hardened/stage4-nomultilib.spec rename to releases/weekly/specs/amd64/hardened/stage4-nomultilib-cloud.spec diff --git a/releases/weekly/specs/amd64/stage4.spec b/releases/weekly/specs/amd64/stage4-cloud.spec similarity index 100% rename from releases/weekly/specs/amd64/stage4.spec rename to releases/weekly/specs/amd64/stage4-cloud.spec diff --git a/releases/weekly/specs/amd64/stage4-nomultilib.spec b/releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec similarity index 100% rename from releases/weekly/specs/amd64/stage4-nomultilib.spec rename to releases/weekly/specs/amd64/stage4-nomultilib-cloud.spec diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index a605ddf6..e756acf6 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -12,15 +12,17 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH} #SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux" SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib" -SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec stage4.spec" -SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" -SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec stage4-nomultilib.spec" +SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec" +SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec stage4.spec" +SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec" +SET_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.spec" SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec" -SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec hardened/stage4.spec" -SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" -SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec hardened/stage4-nomultilib.spec" +SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" +SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec hardened/stage4-cloud.spec" +SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec" +SET_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec" SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec" SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"