Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (06b5d7a4e1b68de10fc574f8fe3b6d39e1ab012a)

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 test cauldron by Justin Boffemmyer (06b5d7a4e1b68de10fc574f8fe3b6d39e1ab012a)
  • Date: Thu, 1 Jan 2009 17:15:35 -0600

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

scripts/spellcaster.sh | 24 ++++++++++++++++++++----
1 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit 06b5d7a4e1b68de10fc574f8fe3b6d39e1ab012a
Author: Justin Boffemmyer <flux AT sourcemage.org>
Commit: Justin Boffemmyer <flux AT sourcemage.org>

scripts/spellcaster.sh: update ld.so.cache

After creating the sys and iso dirs from scratch, they will be lacking
ld.so.conf in their etc/ dirs. The file needs to be added (empty is
fine) and then ldconfig run so that ld.so.cache is generated within both
chroots.

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

scripts/spellcaster.sh: ensure full pathnames

If the specified path is relative to $CWD, fill in the full path
specification. Otherwise the installation of sorcery fails in
setup_sys() because it expects to be able to write to $sys/, but the
sorcery install script needs to be run from the same directory it
resides in so CWD=$SORCERYDIR.

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

scripts/spellcaster.sh: improved setup_sys()

The sorcery and grimoire downloads now use a common dir on the TARGET
(TARGET/tmp). This will make it easier to clean up the files later. The
prefix path was missing from the untarring of the grimoire. Also, the
depends and packages files are force removed from SYSDIR so that we can
ensure we aren't writing duplicate entries in case the script is run
more than once with the same SYSDIR in existence.

diff --git a/scripts/spellcaster.sh b/scripts/spellcaster.sh
index c6b6da7..0be58a9 100755
--- a/scripts/spellcaster.sh
+++ b/scripts/spellcaster.sh
@@ -273,7 +273,7 @@ function install_kernel() {
}

function setup_sys() {
- local SPOOL="$TARGET/var/spool"
+ local SPOOL="$TARGET/tmp"
local SORCERY="sorcery-stable.tar.bz2"
local SORCERYDIR="$TARGET/usr/src/sorcery"
local gvers=$(head -n1 "$TARGET"/var/lib/sorcery/codex/stable/VERSION)
@@ -299,18 +299,20 @@ function setup_sys() {
tar jxf "$SPOOL"/$SORCERY -C "$TARGET/usr/src"
pushd "$SORCERYDIR" &> /dev/null
./install "$SYSDIR"
- popd
+ popd &> /dev/null

# install the stable grimoire used for build into SYSDIR
(
- cd "$TARGET/tmp"
+ cd "$SPOOL"
wget http://download.sourcemage.org/codex/$stable
)
+ echo "Installing grimoire ${stable%.tar.bz2} ..."
[[ -d "$syscodex" ]] || mkdir -p $syscodex &&
- tar jxf $stable -C "$syscodex"/
+ tar jxf "$SPOOL"/$stable -C "$syscodex"/ &&
mv "$syscodex"/${stable%.tar.bz2} "$syscodex"/stable

# generate the depends and packages info for sorcery to use
+ rm -f "$depends" "$packages"
. "$SYSDIR"/etc/sorcery/config
for spell in "$tablet"/*
do
@@ -381,6 +383,16 @@ TYPE="${TYPE:-x86}"
ISODIR="${ISODIR:-/tmp/cauldron/iso}"
SYSDIR="${SYSDIR:-/tmp/cauldron/sys}"

+# ensure full pathnames
+if [[ $(dirname "$ISODIR") == "." ]]
+then
+ ISODIR="$(pwd)/$ISODIR"
+fi
+if [[ $(dirname "$SYSDIR") == "." ]]
+then
+ SYSDIR="$(pwd)/$SYSDIR"
+fi
+
sanity_check

prepare_target
@@ -390,9 +402,13 @@ prepare_target

# unpack sys caches and set up sorcery into SYSDIR
setup_sys
+touch "$SYSDIR"/etc/ld.so.conf
+"$MYDIR/cauldronchr.sh" -d "$SYSDIR" /sbin/ldconfig

# unpack iso caches and copy iso and optional caches into ISODIR
setup_iso
+touch "$SYSDIR"/etc/ld.so.conf
+"$MYDIR/cauldronchr.sh" -d "$ISODIR" /sbin/ldconfig

# Keep a clean kitchen, wipes up the leftovers from the preparation step
clean_target



  • [SM-Commit] GIT changes to test cauldron by Justin Boffemmyer (06b5d7a4e1b68de10fc574f8fe3b6d39e1ab012a), Justin Boffemmyer, 01/01/2009

Archive powered by MHonArc 2.6.24.

Top of Page