sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[molecules] rename CoreCDX -> Minimal

Browse Source
This commit is contained in:
Fabio Erculiani
2013-05-18 11:02:45 +02:00
parent 3c5f0f6680
commit 0d6312fffe
8 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecules/corecdx.common → molecules/minimal.common
View File
molecules/sabayon-amd64-corecdx.spec → molecules/sabayon-amd64-minimal.spec
+2 -2
View File
@@ -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
molecules/sabayon-x86-corecdx.spec → molecules/sabayon-x86-minimal.spec
+2 -2
View File
@@ -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
scripts/gen_html/daily.tmpl
+2 -2
View File
@@ -59,7 +59,7 @@ Even though they should usually work, consider downloading<br>
<dl>
<dt>SpinBase</dt>
<dd>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.</dd>
<dt>CoreCDX</dt>
<dt>Minimal</dt>
<dd>It's geared towards very minimal graphical environment setup, no fancy tools, browsers, whatever, just Fluxbox and command line.</dd>
<dt>ServerBase</dt>
<dd>It's very similar to SpinBase, but powered by a server-optimized Linux kernel (package: sys-kernel/linux-server).</dd>
@@ -69,7 +69,7 @@ Even though they should usually work, consider downloading<br>
<p>
All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.<br>
SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX <strong>should be preferred</strong> for non-standard filesystem/partition layouts.
SpinBase and ServerBase are provided with a very minimal Anaconda Installer and Minimal <strong>should be preferred</strong> for non-standard filesystem/partition layouts.
</p>
<p><strong>the rest:</strong></p>
scripts/gen_html/main.tmpl
+2 -2
View File
@@ -58,7 +58,7 @@ Here's a short description. <strong>More details</strong> can be found <a href="
<dl>
<dt>SpinBase</dt>
<dd>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.</dd>
<dt>CoreCDX</dt>
<dt>Minimal</dt>
<dd>It's geared towards very minimal graphical environment setup, no fancy tools, browsers, whatever, just Fluxbox and command line.</dd>
<dt>ServerBase</dt>
<dd>It's very similar to SpinBase, but powered by a server-optimized Linux kernel (package: sys-kernel/linux-server).</dd>
@@ -70,7 +70,7 @@ Here's a short description. <strong>More details</strong> can be found <a href="
<p>
All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.<br>
SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX <strong>should be preferred</strong> for non-standard filesystem/partition layouts.
SpinBase and ServerBase are provided with a very minimal Anaconda Installer and Minimal <strong>should be preferred</strong> for non-standard filesystem/partition layouts.
</p>
<p>
scripts/gen_html/monthly.tmpl
+2 -2
View File
@@ -58,7 +58,7 @@ Here's a short description. <strong>More details</strong> can be found <a href="
<dl>
<dt>SpinBase</dt>
<dd>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.</dd>
<dt>CoreCDX</dt>
<dt>Minimal</dt>
<dd>It's geared towards very minimal graphical environment setup, no fancy tools, browsers, whatever, just Fluxbox and command line.</dd>
<dt>ServerBase</dt>
<dd>It's very similar to SpinBase, but powered by a server-optimized Linux kernel (package: sys-kernel/linux-server).</dd>
@@ -70,7 +70,7 @@ Here's a short description. <strong>More details</strong> can be found <a href="
<p>
All of them have a smaller footprint making them fit into a single CD, or USB memory sticks.<br>
SpinBase and ServerBase are provided with a very minimal Anaconda Installer and CoreCDX <strong>should be preferred</strong> for non-standard filesystem/partition layouts.
SpinBase and ServerBase are provided with a very minimal Anaconda Installer and Minimal <strong>should be preferred</strong> for non-standard filesystem/partition layouts.
</p>
<p>
scripts/gen_html/templ+abc.pl
+1 -1
View File
@@ -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}_(?<ed>[^_]+)_${re_ver}_${re_arch}\.iso$/) {
my $ed = $fmt->($+{ver}, $+{ed});
add_item ($ed, $+{arch}, $type_ext, $href_link, @extra_args);
scripts/iso_build.sh
+8 -8
View File
@@ -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