Source Mage code commit list

[Andrew Stitt <scm AT sourcemage.org>]

GIT changes to devel-andrew cauldron by Andrew Stitt <acedit AT armory.com>:

 data/ispells.x86               |    3 ---
 data/spells.x86                |    3 ---
 scripts/spellcaster.sh         |    5 ++++-
 scripts/twelve-step-program.sh |   33 ++++++++++++++++++---------------
 4 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit 7f5d49c5e6fbc80355ba37716892b685fcc5456e
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

    add cdrtools

commit c41081a86362e1931a73cde6d7e23f522cef1783
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

    update basesystem

commit a4774e0c589d86ffe2cf83e7d087f4082fab4c21
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

    remove spells which dont work properly

commit b53b42a479eb74d7f536526f96b260783eaf58e9
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

    copy kernel stuff into build environment

commit 4f6ad6737294639131dd9460da2166ddddcaa819
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

    fix echo output

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

    scripts/spellcaster.sh: fix sorcery install
    
    The sorcery install script needs to be called from the directory it
    resides in or it will fail.

diff --git a/data/ispells.x86 b/data/ispells.x86
index a28d7b2..e566337 100644
--- a/data/ispells.x86
+++ b/data/ispells.x86
@@ -37,7 +37,6 @@ locale
 lsscsi
 lvm
 lynx
-madwifi
 man
 mdadm
 memtest86+
@@ -45,7 +44,6 @@ module-init-tools
 nano
 ncurses
 net-tools
-ndiswrapper
 nfs-utils
 ntfsprogs
 openssl
@@ -58,7 +56,6 @@ procps
 readline
 reiser4progs
 reiserfsprogs
-rp-pppoe
 rpmunpack
 run-parts
 sed
diff --git a/data/spells.x86 b/data/spells.x86
index ab11cf6..200e3d9 100644
--- a/data/spells.x86
+++ b/data/spells.x86
@@ -48,7 +48,6 @@ locale
 lvm
 lynx
 m4
-madwifi
 make
 man
 mdadm
@@ -56,7 +55,6 @@ memtest86+
 module-init-tools
 nano
 ncurses
-ndiswrapper
 net-tools
 netkit-base
 netkit-ping
@@ -74,7 +72,6 @@ procps
 readline
 reiser4progs
 reiserfsprogs
-rp-pppoe
 rpmunpack
 run-parts
 sed
diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index 3e8f480..9bec322 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -188,6 +188,7 @@ SPELLS
 function setup_sys() {
        local SPOOL="$TARGET/var/spool"
        local SORCERY="sorcery-stable.tar.bz2"
+       local SORCERYDIR="$TARGET/usr/src/sorcery"
 
        # unpack the sys caches into SYSDIR
        for cache in $(<"$TARGET"/sys-list)
@@ -203,7 +204,9 @@ function setup_sys() {
 
        # unpack and install sorcery into SYSDIR
        tar jxf "$SPOOL"/$SORCERY -C "$TARGET/usr/src"
-       "$TARGET/usr/src/sorcery/install" "$SYSDIR"
+       pushd "$SORCERYDIR" &> /dev/null
+       ./install "$SYSDIR"
+       popd
 }
 
 function setup_iso() {
diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
index 4187882..94ea9a2 100755
--- a/scripts/twelve-step-program.sh
+++ b/scripts/twelve-step-program.sh
@@ -4,12 +4,13 @@
 # TODO: re-factor variable names and messaging logging
 #
 
-  # step 1 (get basesystem)
+  # step 1 get basesystem
   echo step 1
   cd /root
-  #wget http://10.0.0.199/smgl-stable-0.24-basesystem-x86.tar.bz2 &&
-  tar xvf smgl-stable-0.24-basesystem-x86.tar.bz2 &&
-  mv smgl-stable-0.24-basesystem-x86 /root/build &&
+  #wget http://10.0.0.199/smgl-stable-0.27-basesystem-x86.tar.bz2 &&
+  echo unpacking build environment
+  tar xf smgl-stable-0.27-basesystem-x86.tar.bz2 &&
+  mv smgl-stable-0.27-basesystem-x86 /root/build &&
   ls -l /root
   test -d /root/build || 
   echo 'step 1 failed' >> /var/log/sorcery/activity
@@ -17,15 +18,16 @@
   # step 1.5 (add resolv.conf and sorcery url configuration)
   echo "step 1.5"
   cp /etc/resolv.conf /root/build/etc/resolv.conf
-  #cp /etc/sorcery/local/url /root/build/etc/sorcery/local/url
+  cp -fa /lib/modules/* /root/build/lib/modules
+  cp -fa /usr/src/* /root/build/usr/src
+  echo LEAPFORWARD_URL=http://10.0.0.11/smgl/spool/ > 
/root/build/etc/sorcery/local/url
 
-  # step 2 (build spells)
-  echo step 2
+  echo step 2 build spells
   bash /root/cauldron/scripts/spellcaster.sh /root/build x86 ||
   echo 'step 2 failed' >> /var/log/sorcery/activity
 
   
-  echo step 3 (build kernel)
+  echo step 3 build kernel
   pushd /usr/src &&
   wget http://10.0.0.11/smgl/spool/linux-2.6.24.tar.bz2 &&
   tar xf linux-2.6.24.tar.bz2 &&
@@ -41,15 +43,15 @@
   echo 'step 3 failed' >> /var/log/sorcery/activity
 
 
-  echo step 4 (sanity fixes)
+  echo step 4 sanity fixes
   # TODO check for ppp/resolv.conf borkage
-  if test -f /etc/udev/rules.d/70-persistent-net.rules; then
+  if test -f /root/build/etc/udev/rules.d/70-persistent-net.rules; then
     echo "twelve step program failure (udev rules)" >>  
/var/log/sorcery/activity &&
-    rm /etc/udev/rules.d/70-persistent-net.rules
+    rm /root/build/etc/udev/rules.d/70-persistent-net.rules
   fi ||
   echo 'step 4 failed' >> /var/log/sorcery/activity
 
-  echo step 5 (adjust system tree)
+  echo step 5 adjust system tree
   yes ""|bash /root/cauldron/scripts/add-sauce.sh -s /tmp/cauldron/sys &&
   # TODO: cleanse --sweep &&
   rm /tmp/cauldron/sys/var/spool/sorcery/* &&
@@ -59,15 +61,15 @@
   cp /usr/src/linux-2.6.24.tar.bz2 /tmp/cauldron/sys/usr/src ||
   echo 'step 5 failed' >> /var/log/sorcery/activity
 
-  echo step 6 (prune iso tree)
+  echo step 6 prune iso tree
   bash /root/cauldron/scripts/cleaniso.sh -a /tmp/cauldron/iso ||
   echo 'step 6 failed' >> /var/log/sorcery/activity
 
-  echo step 7 (adjust iso tree)
+  echo step 7 adjust iso tree
   yes ""|bash /root/cauldron/scripts/add-sauce.sh -i /tmp/cauldron/iso ||
   echo 'step 7 failed' >> /var/log/sorcery/activity
 
-  echo step 8 (create system.tar.bz2)
+  echo step 8 create system.tar.bz2
   bash /root/cauldron/scripts/mksystem.sh /tmp/cauldron/sys 
/tmp/cauldron/iso/system.tar.bz2 ||
   echo 'step 8 failed' >> /var/log/sorcery/activity
 
@@ -77,6 +79,7 @@
   echo 'step 9 failed' >> /var/log/sorcery/activity
 
   echo step 10 make iso
+  cast -c cdrtools &&
   bash /root/cauldron/scripts/mkrelease.sh /tmp/cauldron/iso omfga-test0 ||
   echo 'step 10 failed' >> /var/log/sorcery/activity