Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master sorcery by David Brown (437fe206b0e7117880efd20d363a965d9e4e74e2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Brown <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master sorcery by David Brown (437fe206b0e7117880efd20d363a965d9e4e74e2)
  • Date: Mon, 1 Jan 2007 23:29:09 -0600

GIT changes to master sorcery by David Brown <dmlb2000 AT gmail.com>:

ChangeLog | 5 +++++
etc/sorcery/config | 2 +-
usr/sbin/delve | 2 ++
var/lib/sorcery/modules/libstage | 2 +-
4 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 437fe206b0e7117880efd20d363a965d9e4e74e2
Author: David Brown <dmlb2000 AT gmail.com>
Commit: David Brown <dmlb2000 AT gmail.com>

found some problems using install root had to fix them tracking some of
the local configs, missing install root prefix in libstage and make sure to
unset install root during delve when its trying to install using stage root
since that is handled during transfer

diff --git a/ChangeLog b/ChangeLog
index d7bec3d..8ef72c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-01-01 David Brown <dmlb2000 AT gmail.com>
+ * delve: empty install root since that's handled by transfer stage
+ * libstage: forgot a prepended INSTALL_ROOT on directory
+ * config: added INSTALL_ROOT'ed local config area to ignore list
+
2006-12-23 David Brown <dmlb2000 AT gmail.com>
* libtrack: track_manual needs to work when staged install is enabled
* build_api/api2: STAGED_INSTALL variable should be exported so delve
diff --git a/etc/sorcery/config b/etc/sorcery/config
index 4a9e152..71faa4b 100755
--- a/etc/sorcery/config
+++ b/etc/sorcery/config
@@ -178,7 +178,7 @@ CONFIG_STAGE_DIRECTORY=${STATE_ROOT}/var

# this is passed directly to installwatch so it can't contain
# shell expansions or regex's
-CASTFS_UNSTAGED_PATHS="/dev /proc /tmp /var/tmp /sys ${BUILD_DIRECTORY}
${SGL_LIBRARY} ${INSTALL_ROOT}/${SGL_LIBRARY} ${SOURCE_CACHE} ${CONFIG_CACHE}
${STATE_DIRECTORY} ${LOG_DIRECTORY}"
+CASTFS_UNSTAGED_PATHS="/dev /proc /tmp /var/tmp /sys ${BUILD_DIRECTORY}
${SGL_LIBRARY} ${INSTALL_ROOT}/${SGL_LIBRARY} ${SOURCE_CACHE} ${CONFIG_CACHE}
${INSTALL_ROOT}/${CONFIG_CACHE} ${STATE_DIRECTORY} ${LOG_DIRECTORY}"
# this value is a mask bits set mean output is done for that particular
# component of castfs
CASTFS_DEBUG_LEVEL=255
diff --git a/usr/sbin/delve b/usr/sbin/delve
index 9c65b8b..c459a64 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -171,6 +171,7 @@ function delve_install() {
export CHROOT_CHECK="true"
CHROOT_CMD="chroot ${STAGE_DIRECTORY}/MOUNT"
fi
+ INSTALL_ROOT=""
else
invoke_installwatch
fi
@@ -204,6 +205,7 @@ function delve_install_extras() {
export CHROOT_CHECK="true"
CHROOT_CMD="chroot ${STAGE_DIRECTORY}/MOUNT"
fi
+ INSTALL_ROOT=""
else
invoke_installwatch
fi
diff --git a/var/lib/sorcery/modules/libstage
b/var/lib/sorcery/modules/libstage
index 72d7058..45fe1d5 100755
--- a/var/lib/sorcery/modules/libstage
+++ b/var/lib/sorcery/modules/libstage
@@ -79,7 +79,7 @@ function stage_install_directory()
mkdir -p $(dirname "${INSTALL_ROOT}/$DIR")
fi &&
message "${FILE_COLOR}$PERMISSION $OWNER:$GROUP $DIR${DEFAULT_COLOR}" &&
- if [[ -d "$DIR" ]]
+ if [[ -d "${INSTALL_ROOT}/$DIR" ]]
then
chmod "$PERMISSION" "${INSTALL_ROOT}/$DIR" &&
chown $OWNER:$GROUP "${INSTALL_ROOT}/$DIR"



  • [SM-Commit] GIT changes to master sorcery by David Brown (437fe206b0e7117880efd20d363a965d9e4e74e2), David Brown, 01/02/2007

Archive powered by MHonArc 2.6.24.

Top of Page