Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (a32b957d396f9c3e2beb47f8f9d58b2cb09ff4f8)

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 devel-stage-root sorcery by David Brown (a32b957d396f9c3e2beb47f8f9d58b2cb09ff4f8)
  • Date: Mon, 23 Oct 2006 16:04:22 -0500

GIT changes to devel-stage-root sorcery by David Brown
<dmlb2000@kajit-master.(none)>:

usr/sbin/delve | 5 ++++-
var/lib/sorcery/modules/build_api/common | 6 ++++++
var/lib/sorcery/modules/libtrack | 3 ++-
3 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit a32b957d396f9c3e2beb47f8f9d58b2cb09ff4f8
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

delve: did a check to see if we had already done this check, this makes
sure the modprobe fuse call in is_castfs_installed doesn't get tracked by
every spell
build_api/common: added another dirty hack to export LD_RUN_PATH and
LD_LIBRARY_PATH for libraries that were just saved... this does need to be
re-thought...
libtrack: added removal of '/' to the install log this prevents odd
messages when archiving

commit 1048c98b2b64cdb1cfbbfd6ee4b10400cc20ec4d
Author: David Brown <dmlb2000@kajit-master.(none)>
Commit: David Brown <dmlb2000@kajit-master.(none)>

added the is_castfs_installed check to delve

diff --git a/usr/sbin/delve b/usr/sbin/delve
index c48fe62..880333a 100755
--- a/usr/sbin/delve
+++ b/usr/sbin/delve
@@ -358,7 +358,10 @@ function main() {

echo "DEBUG: $STATES"

- #STAGED_INSTALL=off
+ if [[ -z $CHROOT_CHECK ]] && ! is_castfs_installed
+ then
+ STAGED_INSTALL=off
+ fi

local last_rc=0
for STATE in $STATES; do
diff --git a/var/lib/sorcery/modules/build_api/common
b/var/lib/sorcery/modules/build_api/common
index 14b6616..f30acad 100755
--- a/var/lib/sorcery/modules/build_api/common
+++ b/var/lib/sorcery/modules/build_api/common
@@ -137,6 +137,12 @@ function real_prepare_install() { (
export PATH="$dir:$PATH"
done
fi
+ if test -d "$SOURCE_DIRECTORY/old.libraries" ; then
+ for dir in $( find "$SOURCE_DIRECTORY/old.libraries" -type d); do
+ export LD_LIBRARY_PATH="$dir:$LD_LIBRARY_PATH"
+ export LD_RUN_PATH="$dir:$LD_RUN_PATH"
+ done
+ fi
}

#---------------------------------------------------------------------
diff --git a/var/lib/sorcery/modules/libtrack
b/var/lib/sorcery/modules/libtrack
index b4e6273..c90b38c 100755
--- a/var/lib/sorcery/modules/libtrack
+++ b/var/lib/sorcery/modules/libtrack
@@ -162,7 +162,8 @@ function create_install_log() {
if [[ $STAGED_INSTALL != off ]]
then
find "${STAGE_DIRECTORY}/TRANSL/" |
- sed "s#${STAGE_DIRECTORY}/TRANSL##g" > $OUTPUT
+ sed "s#${STAGE_DIRECTORY}/TRANSL##g"|
+ grep -v -x '/' > $OUTPUT
else
parse_iw $INPUT |
sort |



  • [SM-Commit] GIT changes to devel-stage-root sorcery by David Brown (a32b957d396f9c3e2beb47f8f9d58b2cb09ff4f8), David Brown, 10/23/2006

Archive powered by MHonArc 2.6.24.

Top of Page