[SM-Commit] GIT changes to devel-andrew cauldron by Andrew Stitt (cfe306e15685595f171be15e0687ca38be2aec7e)

Andrew Stitt scm at sourcemage.org
Sun Dec 7 15:10:29 EST 2008


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

Rebased ref, commits from common ancestor:
commit cfe306e15685595f171be15e0687ca38be2aec7e
Author: Andrew Stitt <acedit at armory.com>
Commit: Andrew Stitt <acedit at armory.com>

    scripts/twelve-step-program.sh: new script
    
    Script is based on twelve step recipe in
    http://wiki.sourcemage.org/Cauldron/ISO_Generation_Steps
    currently the script does not execute to completion successfully

commit 0015aa75a2d28cb3e0fc70a1fb198903705e1cfb
Author: Andrew Stitt <acedit at armory.com>
Commit: Andrew Stitt <acedit at armory.com>

    scripts/spellcast.sh: bug fixes
    
    fix path to cast command
    fix kernel config file copy command
    fix parameter comparison syntax
    copy script to chroot

diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index dda6c18..9dff958 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -9,8 +9,8 @@ then
 	if [[ $CAULDRON_CAST = y ]]
 	then
 		# cast all spells
-		/usr/bin/cast $(tr '\n' ' ' </"$rspells") &&
-		/usr/bin/cast $(tr '\n' ' ' </"$ospells")
+		/usr/sbin/cast $(tr '\n' ' ' </"$rspells") &&
+		/usr/sbin/cast $(tr '\n' ' ' </"$ospells")
 
 	elif [[ $CAULDRON_DISPEL = y ]]
 	then
@@ -112,13 +112,14 @@ then
 fi
 
 # Copy necessary files to the target and chroot
-$(grep -q linux "$CAULDRONDIR/{$rspells,$ospells}") && cp "$CAULDRONDIR/config.$TYPE" "$TARGET/etc/sorcery/local/kernel.config"
-[[ CAULDRON_CAST = y ]] && cp "$CAULDRONDIR/$rspells" "$TARGET"/
+$(grep -q linux "$CAULDRONDIR/$rspells" "$CAULDRONDIR/$ospells" ) && cp "$CAULDRONDIR/config-2.6" "$TARGET/etc/sorcery/local/kernel.config"
+[[ $CAULDRON_CAST = y ]] && cp "$CAULDRONDIR/$rspells" "$TARGET"/
 cp "$CAULDRONDIR/$ospells" "$TARGET"/
+cp "$0" "$TARGET"/
 "$MYDIR/cauldronchr.sh" -d "$TARGET" /"$(basename $0)"
 
 # Clean up the target
-[[ CAULDRON_CAST = y ]] && rm "$TARGET/$rspells"
+[[ $CAULDRON_CAST = y ]] && rm "$TARGET/$rspells"
 rm "$TARGET/$ospells"
 [[ -e "$TARGET/etc/sorcery/local/kernel.config" ]] && rm "$TARGET/etc/sorcery/local/kernel.config"
 rm "$TARGET/$(basename $0)"
diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
new file mode 100755
index 0000000..5d6a190
--- /dev/null
+++ b/scripts/twelve-step-program.sh
@@ -0,0 +1,106 @@
+#!/bin/sh
+#
+# twelve step iso generation script
+# TODO: re-factor variable names and messaging logging
+#
+
+  # step 0 (install cauldron support scripts)
+  echo 'step 0 started' >> /var/log/sorcery/activity
+  cd /root &&
+  yes ""|cast git &&
+  ping -c 1 scm.sourcemage.org &&
+  git clone git://scm.sourcemage.org/smgl/cauldron /root/cauldron &&
+  cd cauldron &&
+  git checkout origin/test &&
+  cd .. &&
+  ls -l /root &&
+  find /root/cauldron &&
+  test -d /root/cauldron || 
+  echo 'step 0 failed' >> /var/log/sorcery/activity
+
+
+  # step 1 (get basesystem)
+  echo step 1
+  cd /root
+  wget http://10.0.0.199/smgl-stable-0.24-basesystem-x86.tar.bz2 &&
+  tar xf smgl-stable-0.24-basesystem-x86.tar.bz2 &&
+  mv smgl-stable-0.24-basesystem-x86 /root/build &&
+  ls -l /root
+  test -d /root/build || 
+  echo 'step 1 failed' >> /var/log/sorcery/activity
+
+  # step 2 (build spells)
+  echo step 2
+  bash /root/cauldron/scripts/spellcaster.sh -c /root/build x86 ||
+  echo 'step 2 failed' >> /var/log/sorcery/activity
+
+  
+  # step 3 (build kernel)
+  echo step 3
+  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 &&
+  ln -s linux-2.6.24 linux &&
+  cp /root/cauldron/data/config-2.6 /usr/src/linux/.config &&
+  pushd linux &&
+    yes ""|make oldconfig; make -j 4 &&
+    make -j 4 && make modules -j 4 && make modules_install &&
+  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 ||
+  echo 'step 3 failed' >> /var/log/sorcery/activity
+
+
+  # step 4
+  echo step 4
+  if test -f /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
+  fi ||
+  echo 'step 4 failed' >> /var/log/sorcery/activity
+
+  # step 5 (create iso and system tree)
+  echo step 5
+  cp -fav build iso &&
+  cp -fav build system &&
+  bash /root/cauldron/scripts/spellcaster.sh -d system x86 ||
+  echo 'step 5 failed' >> /var/log/sorcery/activity
+
+  # step 6 (adjust system tree)
+  echo step 6
+  yes ""|bash /root/cauldron/scripts/add-sauce.sh -s /root/system &&
+  rm -rf /root/system/var/spool/sorcery/* &&
+  rm -rf /root/system/var/cache/sorcery/* &&
+  rm -rf /root/system/usr/src/* &&
+  # TODO symlink with /var/spool/sorcery &&
+  cp /usr/src/linux-2.6.24.tar.bz2 /root/system/usr/src ||
+  echo 'step 6 failed' >> /var/log/sorcery/activity
+  
+  # step 7 (adjust iso tree)
+  echo step 7
+  bash /root/cauldron/scripts/cleaniso.sh -a /root/iso &&
+  yes ""|bash /root/cauldron/scripts/add-sauce.sh -i /root/iso ||
+  echo 'step 7 failed' >> /var/log/sorcery/activity
+
+  # step 8 (create system.tar.bz2)
+  echo step 8
+  mkdir -p /root/cauldron/iso/ &&
+  bash /root/cauldron/scripts/mksystem.sh /root/system /root/cauldron/iso/system.tar.bz2 ||
+  echo 'step 8 failed' >> /var/log/sorcery/activity
+
+  # step 9
+  echo step 9
+  bash /root/cauldron/scripts/mkinitrd.sh /root/iso 2.6.24 &&
+  cp initrd.gz /root/cauldron/iso/boot/initrd.gz ||
+  echo 'step 9 failed' >> /var/log/sorcery/activity
+
+  # step 10
+  echo step 10
+  bash /root/cauldron/scripts/mkrelease.sh /root/iso omfga-test0 ||
+  echo 'step 10 failed' >> /var/log/sorcery/activity
+
+  # step 11
+  # test in VM, cant get there from here
+  # step 12
+  # final QA, cant get there from here



More information about the SM-Commit mailing list