Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (6e597415db9ffc98d18c0748aa06a9651276ea85)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Karsten Behrmann <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (6e597415db9ffc98d18c0748aa06a9651276ea85)
  • Date: Tue, 6 Feb 2007 07:39:53 -0600

GIT changes to master cauldron by Karsten Behrmann
<BearPerson AT sourcemage.org>:

iso/generation-scripts/Makefile | 12 ++++++------
iso/generation-scripts/caster | 2 ++
iso/generation-scripts/config | 2 +-
iso/generation-scripts/mkroot | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit 7be02bf6f9513fce6a26d7fd33b2bc10d1b42b6e
Author: Karsten Behrmann <BearPerson AT sourcemage.org>
Commit: Karsten Behrmann <BearPerson AT sourcemage.org>

Small typo fixes, disable detection of up-to-dateness for now

diff --git a/chroot/chrootgen.sh b/chroot/chrootgen.sh
old mode 100644
new mode 100755
diff --git a/iso/generation-scripts/Makefile b/iso/generation-scripts/Makefile
index ea2b29d..a3cd2d0 100644
--- a/iso/generation-scripts/Makefile
+++ b/iso/generation-scripts/Makefile
@@ -7,24 +7,24 @@ all: iso

sanitize_source:
if [ "${SOURCE_ROOT}" != "/" ] ;then \
- ./sanitize_chroot ${SOURCE_ROOT} \
+ ./sanitize_chroot.sh ${SOURCE_ROOT} \
fi

-${DESTINATION_ROOT}: sanitize_source
+${DESTINATION_ROOT}: | sanitize_source
./mkroot ${SOURCE_ROOT} ${DESTINATION_ROOT}

sanitize_dest: ${DESTINATION_ROOT}
- ./sanitize_chroot ${DESTINATION_ROOT}
+ ./sanitize_chroot.sh ${DESTINATION_ROOT}

-target_copy_files: sanitize_dest
+target_copy_files: | sanitize_dest
./mkprep ${DESTINATION_ROOT}/root/p4
touch target_copy_files

-target_create_tarballs: target_copy_files sanitize_dest
+target_create_tarballs: target_copy_files | sanitize_dest
chroot ${DESTINATION_ROOT} bash -c "cd /root/p4/generation-scripts ;
./first_build"
touch target_create_tarballs

-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

cp $CHROOTGEN/chrootgen.sh $1/
-rm -r $1/chroot-configset $1/new-root $1/tmp/backup_configs
+rm -rf $1/chroot-configset $1/new-root $1/tmp/backup_configs
cp -a $CHROOTGEN/$ISO_ARCH $1/chroot-configset

#FIXME: Force specific grimoire to be updated and used (preferrably without



  • [SM-Commit] GIT changes to master cauldron by Karsten Behrmann (6e597415db9ffc98d18c0748aa06a9651276ea85), Karsten Behrmann, 02/06/2007

Archive powered by MHonArc 2.6.24.

Top of Page