Source Mage code commit list

[Andrew Stitt <scm AT sourcemage.org>]

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

 scripts/twelve-step-program.sh |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 6927dfbd3ac053a70dc77f8757c56a21e864b502
Author: Andrew Stitt <acedit AT armory.com>
Commit: Andrew Stitt <acedit AT armory.com>

    copy kernel files to iso tree after step 3. fix src directory name

diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
index 31ca289..458fd56 100755
--- a/scripts/twelve-step-program.sh
+++ b/scripts/twelve-step-program.sh
@@ -23,6 +23,7 @@
   echo LEAPFORWARD_URL=http://10.0.0.11/smgl/spool/ > 
/root/build/etc/sorcery/local/url
 
   echo step 2 build kernel
+  # may be handled by step 3 later on
   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 &&
@@ -34,13 +35,19 @@
   popd &&
   ls /lib/modules &&
   cp -fav /lib/modules/2.6.24 /root/build/lib/modules &&
-  cp -fav /usr/src/linux-2.6.22 /root/build/usr/src ||
+  cp -fav /usr/src/linux-2.6.24 /root/build/usr/src ||
   echo 'step 2 failed' >> /var/log/sorcery/activity
 
   echo step 3 build spells
   bash /root/cauldron/scripts/spellcaster.sh /root/build x86 ||
   echo 'step 3 failed' >> /var/log/sorcery/activity
 
+  step 3.5 copy kernel sources to iso and sys tree
+  # may be handled by step 3 later on
+  cp -fav /lib/modules/2.6.24 /tmp/cauldron/iso/lib/modules &&
+  cp -fav /usr/src/linux-2.6.24 /tmp/cauldron/iso/usr/src ||
+  echo 'step 3.5 failed' >> /var/log/sorcery/activity
+
   echo step 4 sanity fixes
   # TODO check for ppp/resolv.conf borkage
   if test -f /root/build/etc/udev/rules.d/70-persistent-net.rules; then