From 0d6312fffe8df732392ea5f5bb436332e547e6e8 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sat, 18 May 2013 11:02:45 +0200 Subject: [PATCH] [molecules] rename CoreCDX -> Minimal --- molecules/{corecdx.common => minimal.common} | 0 ...4-corecdx.spec => sabayon-amd64-minimal.spec} | 4 ++-- ...x86-corecdx.spec => sabayon-x86-minimal.spec} | 4 ++-- scripts/gen_html/daily.tmpl | 4 ++-- scripts/gen_html/main.tmpl | 4 ++-- scripts/gen_html/monthly.tmpl | 4 ++-- scripts/gen_html/templ+abc.pl | 2 +- scripts/iso_build.sh | 16 ++++++++-------- 8 files changed, 19 insertions(+), 19 deletions(-) rename molecules/{corecdx.common => minimal.common} (100%) rename molecules/{sabayon-amd64-corecdx.spec => sabayon-amd64-minimal.spec} (80%) rename molecules/{sabayon-x86-corecdx.spec => sabayon-x86-minimal.spec} (85%) diff --git a/molecules/corecdx.common b/molecules/minimal.common similarity index 100% rename from molecules/corecdx.common rename to molecules/minimal.common diff --git a/molecules/sabayon-amd64-corecdx.spec b/molecules/sabayon-amd64-minimal.spec similarity index 80% rename from molecules/sabayon-amd64-corecdx.spec rename to molecules/sabayon-amd64-minimal.spec index 65ecc9c..284ae2b 100644 --- a/molecules/sabayon-amd64-corecdx.spec +++ b/molecules/sabayon-amd64-minimal.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily iso build won't work -%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/corecdx.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/minimal.common %env release_version: ${SABAYON_RELEASE:-11} release_desc: amd64 CoreCDX @@ -8,4 +8,4 @@ release_desc: amd64 CoreCDX %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_amd64_SpinBase.iso # Destination ISO image name, call whatever you want.iso, not mandatory -%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_CoreCDX.iso +%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_amd64_Minimal.iso diff --git a/molecules/sabayon-x86-corecdx.spec b/molecules/sabayon-x86-minimal.spec similarity index 85% rename from molecules/sabayon-x86-corecdx.spec rename to molecules/sabayon-x86-minimal.spec index 64643e6..fc2c7c4 100644 --- a/molecules/sabayon-x86-corecdx.spec +++ b/molecules/sabayon-x86-minimal.spec @@ -1,5 +1,5 @@ # use abs path, otherwise daily iso build automagic won't work -%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/corecdx.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/minimal.common %env release_version: ${SABAYON_RELEASE:-11} release_desc: x86 CoreCDX @@ -12,4 +12,4 @@ prechroot: linux32 %env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_x86_SpinBase.iso # Destination ISO image name, call whatever you want.iso, not mandatory -%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_CoreCDX.iso +%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-11}_x86_Minimal.iso diff --git a/scripts/gen_html/daily.tmpl b/scripts/gen_html/daily.tmpl index 6c05c0a..5fab43e 100644 --- a/scripts/gen_html/daily.tmpl +++ b/scripts/gen_html/daily.tmpl @@ -59,7 +59,7 @@ Even though they should usually work, consider downloading
SpinBase
It's a very minimal environment that can be used for many different purposes: didactical, home server deployment, and even for custom Sabayon ISO images creation, using our tool called Molecule. Any Sabayon release we make is based on SpinBase.
-
CoreCDX
+
Minimal
It's geared towards very minimal graphical environment setup, no fancy tools, browsers, whatever, just Fluxbox and command line.
ServerBase
It's very similar to SpinBase, but powered by a server-optimized Linux kernel (package: sys-kernel/linux-server).
@@ -69,7 +69,7 @@ Even though they should usually work, consider downloading

All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.
-SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX should be preferred for non-standard filesystem/partition layouts. +SpinBase and ServerBase are provided with a very minimal Anaconda Installer and Minimal should be preferred for non-standard filesystem/partition layouts.

the rest:

diff --git a/scripts/gen_html/main.tmpl b/scripts/gen_html/main.tmpl index f70df72..4952fd8 100644 --- a/scripts/gen_html/main.tmpl +++ b/scripts/gen_html/main.tmpl @@ -58,7 +58,7 @@ Here's a short description. More details can be found All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.
-SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX should be preferred for non-standard filesystem/partition layouts. +SpinBase and ServerBase are provided with a very minimal Anaconda Installer and Minimal should be preferred for non-standard filesystem/partition layouts.

diff --git a/scripts/gen_html/monthly.tmpl b/scripts/gen_html/monthly.tmpl index 647da50..9e91d9a 100644 --- a/scripts/gen_html/monthly.tmpl +++ b/scripts/gen_html/monthly.tmpl @@ -58,7 +58,7 @@ Here's a short description. More details can be found All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.
-SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX should be preferred for non-standard filesystem/partition layouts. +SpinBase and ServerBase are provided with a very minimal Anaconda Installer and Minimal should be preferred for non-standard filesystem/partition layouts.

diff --git a/scripts/gen_html/templ+abc.pl b/scripts/gen_html/templ+abc.pl index 15c4b4f..872d021 100755 --- a/scripts/gen_html/templ+abc.pl +++ b/scripts/gen_html/templ+abc.pl @@ -209,7 +209,7 @@ sub parse_entry { add_item ($ed, $+{arch}, $type_ext, $href_link, @extra_args); } - # Sabayon_Linux_CoreCDX_DAILY_amd64.iso + # Sabayon_Linux_Minimal_DAILY_amd64.iso elsif ($href =~ /^${re_pref}_(?[^_]+)_${re_ver}_${re_arch}\.iso$/) { my $ed = $fmt->($+{ver}, $+{ed}); add_item ($ed, $+{arch}, $type_ext, $href_link, @extra_args); diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh index 2843ba0..64b9e58 100755 --- a/scripts/iso_build.sh +++ b/scripts/iso_build.sh @@ -92,8 +92,8 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then "sabayon-x86-xfce.spec" "sabayon-amd64-e17.spec" "sabayon-x86-e17.spec" - "sabayon-amd64-corecdx.spec" - "sabayon-x86-corecdx.spec" + "sabayon-amd64-minimal.spec" + "sabayon-x86-minimal.spec" ) REMASTER_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME.iso" @@ -106,8 +106,8 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then "${DISTRO_NAME}_${ISO_TAG}_x86_Xfce.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_E17.iso" "${DISTRO_NAME}_${ISO_TAG}_x86_E17.iso" - "${DISTRO_NAME}_${ISO_TAG}_amd64_CoreCDX.iso" - "${DISTRO_NAME}_${ISO_TAG}_x86_CoreCDX.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_Minimal.iso" + "${DISTRO_NAME}_${ISO_TAG}_x86_Minimal.iso" ) # Weekly molecules @@ -202,8 +202,8 @@ elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then "sabayon-x86-mate.spec" "sabayon-amd64-xfce.spec" "sabayon-x86-xfce.spec" - "sabayon-amd64-corecdx.spec" - "sabayon-x86-corecdx.spec" + "sabayon-amd64-minimal.spec" + "sabayon-x86-minimal.spec" ) REMASTER_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_GNOME.iso" @@ -214,8 +214,8 @@ elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then "${DISTRO_NAME}_${ISO_TAG}_x86_MATE.iso" "${DISTRO_NAME}_${ISO_TAG}_amd64_Xfce.iso" "${DISTRO_NAME}_${ISO_TAG}_x86_Xfce.iso" - "${DISTRO_NAME}_${ISO_TAG}_amd64_CoreCDX.iso" - "${DISTRO_NAME}_${ISO_TAG}_x86_CoreCDX.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_Minimal.iso" + "${DISTRO_NAME}_${ISO_TAG}_x86_Minimal.iso" ) fi