Source Mage code commit list

[Justin Boffemmyer <scm AT sourcemage.org>]

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

 data/ispells.x86       |    1 +
 data/sorcery.depends   |    2 ++
 scripts/spellcaster.sh |   25 +++++++++++++++++++++++--
 3 files changed, 26 insertions(+), 2 deletions(-)

New commits:
commit 8da19e0e03258bc619d10c87657ce1d35facf191
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    data/ispells.x86: add wpa_supplicant
    
    Add wpa_supplicant, which may not necessarily be an absolute requirement
    for getting wireless networking up and running (even with WPA; it
    depends on the driver's features and one's familiarity manually
    configuring for an ssid with wireless-tools), but definitely makes life
    easier. It is provided in ispells rather than ospells for now because,
    like the other base networking spells, although we don't advocate
    connecting to net from inside the ISO runtime rather than an installed
    system, we allow for it in case the user needs it and knows what he/she
    is doing.

commit 28145288aadd778f7b77ab2e2677f31863b0c43d
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    spellcaster: forced optional depends in build
    
    When spells are cast in the chroot, sorcery relies depends information
    to determine the default for whether an optional dependency should be
    enabled for the spell being cast. This commit implements a method for
    forcing such dependencies as either enabled or disabled via listing the
    spell, optional dependency, and enabled state  ("on" or "off")in
    data/sorcery.depends. The contents of this file are used to overwrite
    var/state/sorcery/depends in the build chroot before performing any
    casting.

commit 4262d8576ad73d6309b65233bb19e1fa3e86e931
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    scripts/spellcaster.sh: --compile for build casts
    
    Force all build chroot casting to be done with --compile. At present,
    --queue implies --compile (I believe). It's a better idea to force it,
    in case --queue ever changes and no longer implies it.

commit c6c54557ebb4e85cf9ac89d8f5daf33084e8389a
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

    scripts/spellcaster.sh: option for cast VOYEUR
    
    Implement a new option to determine whether the build chroot casts
    should be done with VOYEUR enabled or not. This has yet to be tested,
    but should work.

diff --git a/data/ispells.x86 b/data/ispells.x86
index a28d7b2..bf36a72 100644
--- a/data/ispells.x86
+++ b/data/ispells.x86
@@ -78,5 +78,6 @@ uudeview
 wget
 which
 wireless_tools
+wpa_supplicant
 xfsprogs
 zlib
diff --git a/data/sorcery.depends b/data/sorcery.depends
new file mode 100644
index 0000000..d9d8dff
--- /dev/null
+++ b/data/sorcery.depends
@@ -0,0 +1,2 @@
+coreutils:gmp:off
+openssl:gmp:off
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 15c63cf..5d3bfda 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -46,6 +46,10 @@ Options:
            processing. Conflicts with -b.
 
        -q  Suppress output messages. Defaults to off (output shown on 
STDERR).
+
+       -v  Enable VOYEUR in the build sorcery. By default build compilation 
is
+           silent (VOYEUR=off). This option allows you to see the 
compilations
+           as they happen in the build chroot.
 EndUsage
   exit 1
 } >&2
@@ -60,6 +64,7 @@ function parse_options() {
                        s ) SYSDIR="${OPTARG%/}" ;;
                        n ) NOBUILD="yes" ;;
                        q ) QUIET="yes" ;;
+                       v ) VOYEUR="yes" ;;
                        h ) usage ;;
                        * ) echo "Unrecognized option." >&2 && usage ;;
                esac
@@ -203,6 +208,7 @@ function prepare_target() {
                "ppc"   ) arch="g3"
                        ;;
        esac
+
        cat > "$TARGET"/set_sorcery.sh <<-CONFIGURE
                #!/bin/bash
                source /etc/sorcery/config
@@ -211,6 +217,16 @@ function prepare_target() {
                modify_config /etc/sorcery/local/config PRESERVE off
                modify_config /etc/sorcery/local/config PROMPT_DELAY 0
        CONFIGURE
+
+       # silent compiles by default
+       # but if -v passed as option then turn VOYEUR on
+       if [[ $VOYEUR != "yes" ]]
+       then
+               echo "modify_config /etc/sorcyer/local/config VOYEUR off" >> 
"$TARGET"/set_sorcery.sh
+       else
+               echo "modify_config /etc/sorcyer/local/config VOYEUR on" >> 
"$TARGET"/set_sorcery.sh
+       fi
+
        chmod a+x "$TARGET"/set_sorcery.sh &&
        msg "Configuring build sorcery"
        "$MYDIR"/cauldronchr.sh -d "$TARGET" /set_sorcery.sh &&
@@ -226,9 +242,13 @@ function prepare_target() {
                rm -f $logfile
        done
 
+       # nuke any existing sorcery state information in the build dir
+       rm -fr "$installdir/var/state/sorcery/*"
+
+       # If building for an ISO (instead of a basesystem chroot) and using 
the
+       # linux spell, copy the kernel config to TARGET sorcery
        if [[ -z $CHROOT ]]
        then
-               # If using the linux spell copy the kernel config to TARGET 
sorcery
                grep -q '^linux$' "$CAULDRONDIR/$rspells" 
"$CAULDRONDIR/$ospells" &&
                cp "$CAULDRONDIR/config-2.6" 
"$TARGET/etc/sorcery/local/kernel.config"
        fi
@@ -245,6 +265,7 @@ function prepare_target() {
        [[ -d "$TARGET"/etc/sorcery/local/depends/ ]] ||
                mkdir -p "$TARGET"/etc/sorcery/local/depends/
        cp "$CAULDRONDIR"/depends/* "$TARGET"/etc/sorcery/local/depends/
+       cat "$CAULDRONDIR"/sorcery.depends > 
"$TARGET"/var/state/sorcery/depends
 
        # generate basesystem casting script inside of TARGET
        cat > "$TARGET"/build_spells.sh <<-'SPELLS'
@@ -288,7 +309,7 @@ function prepare_target() {
 
                # cast all the spells using the install queue and save the
                # return value to a log file
-               /usr/sbin/cast --queue 2> /build_spells.log
+               /usr/sbin/cast --compile --queue 2> /build_spells.log
                echo $? >> /build_spells.log
 
                # make a list of the caches to unpack for system