[SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (ce1186235982a811a8123df921743984e32770ae)

Justin Boffemmyer scm at sourcemage.org
Sun Feb 8 12:04:05 EST 2009


GIT changes to test cauldron by Justin Boffemmyer <flux at sourcemage.org>:

 iso/usr/share/doc/smgl.install/steps/select-spells |   10 +++++++---
 scripts/spellcaster.sh                             |    3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit ce1186235982a811a8123df921743984e32770ae
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    steps/select-spells: add warning about rspells
    
    Add warning about rspells overlapping with ISO caches to the step
    instructions in addition to the info presented by smgl-spells. Also
    reference the /tmp/rspells list so the user can see all the rspells.

commit ac7489eb08343c94c1acc2e8cf2bd25d9e165c0f
Author: Justin Boffemmyer <flux at sourcemage.org>
Commit: Justin Boffemmyer <flux at sourcemage.org>

    scripts/spellcaster.sh: add rspells list to iso
    
    Add the rspells list to the iso tree for reference during the install.

diff --git a/iso/usr/share/doc/smgl.install/steps/select-spells b/iso/usr/share/doc/smgl.install/steps/select-spells
index 5c52163..ad90912 100644
--- a/iso/usr/share/doc/smgl.install/steps/select-spells
+++ b/iso/usr/share/doc/smgl.install/steps/select-spells
@@ -1,9 +1,13 @@
 select-spells step
 You may now select the spells you would like that are provided on the ISO.
 There are currently two ways that you can accomplish this. Both methods make
-use of /tmp/spells. Note that it is crucial to install some spells (such as a
-bootloader) or your system may not function, so some of these have been
-included as defaults in /tmp/spells.
+use of /tmp/spells. It is crucial to install some spells (such as a bootloader)
+or your system may not function, so some of these have been included as
+defaults in /tmp/spells. NOTE: the ISO caches represent ALL spells installed
+for the ISO runtime, and are selectable for install, regardless of whether they
+are also included in system.tar.bz2 as well - gcc, glibc, bash, etc. are
+avaialble both in system.tar.bz2 AND in the ISO's /var/cache/sorcery/
+directory. For a list of the spells in system.tar.bz2, see /tmp/rspells.
 
 text menu:
  smgl-spells
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index b19ce63..2f4eb01 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -558,6 +558,9 @@ function setup_iso() {
 	msg "Running add-sauce.sh on ISODIR"
 	"$MYDIR"/add-sauce.sh -o -i "$ISODIR"
 
+	# add the rspells list to the ISO for later reference
+	cp -f "$CAULDRONDIR/rspells.$TYPE" "$ISODIR"/tmp/rspells
+
 	# save the grimoire version used for building everything to ISODIR for reference
 	msg "Saving grimoire version to ISODIR"
 	cp -f $GVERS "$ISODIR"/etc/grimoire_version



More information about the SM-Commit mailing list