Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (3e3ad04985acd70561d6e21c80ca9869ff891706)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Justin Boffemmyer <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (3e3ad04985acd70561d6e21c80ca9869ff891706)
  • Date: Sun, 4 Jan 2009 08:31:59 -0600

GIT changes to devel-andrew cauldron by Justin Boffemmyer
<flux AT sourcemage.org>:

scripts/twelve-step-program.sh | 42
+++++++++++++++++++++--------------------
1 files changed, 22 insertions(+), 20 deletions(-)

New commits:
commit 3e3ad04985acd70561d6e21c80ca9869ff891706
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/twelve-step-program.sh: rootdir variable

Don't hardcode the root build directory, but encode it in a variable
that can later be set more easily.

diff --git a/scripts/twelve-step-program.sh b/scripts/twelve-step-program.sh
index 2580cdc..ca7a82c 100755
--- a/scripts/twelve-step-program.sh
+++ b/scripts/twelve-step-program.sh
@@ -4,22 +4,24 @@
# TODO: re-factor variable names and messaging logging
#

+ROOT="/root"
+
# step 1 get basesystem
echo step 1
- cd /root
+ cd "$ROOT"
#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 ||
+ mv smgl-stable-0.27-basesystem-x86 "$ROOT"/build &&
+ ls -l "$ROOT"
+ test -d "$ROOT"/build ||
echo 'step 1 failed' >> /var/log/sorcery/activity

# step 1.5 (add resolv.conf and host sorcery url/compiler configuration)
echo "step 1.5"
- cp /etc/resolv.conf /root/build/etc/resolv.conf
- cp /etc/sorcery/local/compile_config
/root/build/etc/sorcery/local/compile_config
- echo LEAPFORWARD_URL=http://10.0.0.11/smgl/spool/ >
/root/build/etc/sorcery/local/url
+ cp /etc/resolv.conf "$ROOT"/build/etc/resolv.conf
+ cp /etc/sorcery/local/compile_config
"$ROOT"/build/etc/sorcery/local/compile_config
+ 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
@@ -27,18 +29,18 @@
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 &&
+ 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-SMGL-iso /root/build/lib/modules &&
- cp -fav /usr/src/linux-2.6.24 /root/build/usr/src ||
+ cp -fav /lib/modules/2.6.24-SMGL-iso "$ROOT"/build/lib/modules &&
+ 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 ||
+ bash "$ROOT"/cauldron/scripts/spellcaster.sh "$ROOT"/build x86 ||
echo 'step 3 failed' >> /var/log/sorcery/activity

echo step 3.5 copy kernel sources to iso and sys tree
@@ -49,14 +51,14 @@

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
+ 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 /root/build/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
- yes ""|bash /root/cauldron/scripts/add-sauce.sh -s /tmp/cauldron/sys &&
+ yes ""|bash "$ROOT"/cauldron/scripts/add-sauce.sh -s /tmp/cauldron/sys &&
# TODO: cleanse --sweep &&
rm /tmp/cauldron/sys/var/spool/sorcery/* &&
rm /tmp/cauldron/sys/var/cache/sorcery/* &&
@@ -66,25 +68,25 @@
echo 'step 5 failed' >> /var/log/sorcery/activity

echo step 6 prune iso tree
- bash /root/cauldron/scripts/cleaniso.sh -a /tmp/cauldron/iso ||
+ bash "$ROOT"/cauldron/scripts/cleaniso.sh -a /tmp/cauldron/iso ||
echo 'step 6 failed' >> /var/log/sorcery/activity

echo step 7 adjust iso tree
- yes ""|bash /root/cauldron/scripts/add-sauce.sh -i /tmp/cauldron/iso ||
+ 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
- bash /root/cauldron/scripts/mksystem.sh /tmp/cauldron/sys
/tmp/cauldron/iso/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

echo step 9 make initrd
- bash /root/cauldron/scripts/mkinitrd.sh /tmp/cauldron/iso 2.6.24-SMGL-iso
&&
- cp initrd.gz /root/cauldron/iso/boot/initrd.gz ||
+ bash "$ROOT"/cauldron/scripts/mkinitrd.sh /tmp/cauldron/iso
2.6.24-SMGL-iso &&
+ cp initrd.gz "$ROOT"/cauldron/iso/boot/initrd.gz ||
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 ||
+ bash "$ROOT"/cauldron/scripts/mkrelease.sh /tmp/cauldron/iso omfga-test0 ||
echo 'step 10 failed' >> /var/log/sorcery/activity

# step 11



  • [SM-Commit] GIT changes to devel-andrew cauldron by Justin Boffemmyer (3e3ad04985acd70561d6e21c80ca9869ff891706), Justin Boffemmyer, 01/04/2009

Archive powered by MHonArc 2.6.24.

Top of Page