-iso: target_create_tarballs sanitize_dest
+iso: target_create_tarballs | sanitize_dest
chroot ${DESTINATION_ROOT} bash -c "cd /root/p4/generation-scripts ;
./mk-smgl-iso"
@echo "phew, we're done. look for the ISO in ${DESTINATION_ROOT}"
diff --git a/iso/generation-scripts/caster b/iso/generation-scripts/caster
index c4124e8..84ab4d0 100755
--- a/iso/generation-scripts/caster
+++ b/iso/generation-scripts/caster
@@ -99,6 +99,8 @@ function filter_dirs() {
# As the spell isn't neccessarily installed, we need to fiddle our stuff from
# the cache tarball (its filename gets passed as $1)
function needs_updating() {
+ return 1 # TODO: disable this for now, this doesn't seem to work yet
+
local TMPTABDIR=/tmp/tabletstuff.$$
mkdir -p $TMPTABDIR
diff --git a/iso/generation-scripts/config b/iso/generation-scripts/config
index 08e046b..8fd22dc 100755
--- a/iso/generation-scripts/config
+++ b/iso/generation-scripts/config
@@ -26,7 +26,7 @@ ARCH=${ARCH:-$(. /etc/sorcery/config ; e
# Try to figure out what architecture we are
# TODO: This is a hack
ISO_ARCH=${ISO_ARCH:-$(uname -m)}
-[[ $ISO_ARCH == ppc ]] || [[ $ISO_ARCH == x86_64 ]] || ISO_ARCH=i486
+[[ $ISO_ARCH == ppc ]] || [[ $ISO_ARCH == x86_64 ]] || ISO_ARCH=x86
# Sorcery version, Grimoire version, Kernel version
SVERSION=${SVERSION:-test}
diff --git a/iso/generation-scripts/mkroot b/iso/generation-scripts/mkroot
index c4a3eea..2e73e70 100644
--- a/iso/generation-scripts/mkroot
+++ b/iso/generation-scripts/mkroot
@@ -9,7 +9,7 @@ if [[ -z $2 ]] ;then
fi