CVS: lunar/var/lib/lunar/functions build.lunar, 1.1, 1.2 check.lunar,
1.1, 1.2 download.lunar, 1.7, 1.8 install.lunar, 1.1,
1.2 optimize.lunar, 1.14, 1.15
sofar at lunar-linux.org
sofar at lunar-linux.org
Sun Sep 14 14:31:21 GMT 2003
Update of /var/cvs/lunar/lunar/var/lib/lunar/functions
In directory dbguin.lunar-linux.org:/tmp/cvs-serv2543/var/lib/lunar/functions
Modified Files:
build.lunar check.lunar download.lunar install.lunar
optimize.lunar
Log Message:
Bugfix merge... including several bugfixes from theedge that needed to be merged back into lunar
Index: build.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/build.lunar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- build.lunar 10 Aug 2003 01:18:55 -0000 1.1
+++ build.lunar 14 Sep 2003 14:31:19 -0000 1.2
@@ -258,9 +258,10 @@
install_pam_confs
install_services
install_xinetd_confs
- install_initd
install_bashmisc
} | tee -a $C_LOG
+
+ install_initd
devoke_installwatch
ldconfig
Index: check.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/check.lunar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- check.lunar 10 Aug 2003 01:18:55 -0000 1.1
+++ check.lunar 14 Sep 2003 14:31:19 -0000 1.2
@@ -404,47 +404,17 @@
cp $DEPENDS_STATUS $DEPENDS_STATUS_BACKUP
fi
- OLD_FIX=$FIX
- unset FIX
- OLD_lin_PASS=$lin_PASS; export lin_PASS=three
-
for MODULE in $CHANGED_MODULES ; do
- if [ -n "$FIXDEPENDS" ] ; then
- # special case: when called with --fixdepends, skip recompile!
- cp $TMP/depends $TMP/depends.filter
- for MODULE in $CHANGED_MODULES ; do
- grep -v "^$MODULE:" $TMP/depends.filter > $TMP/depends.filter~
- mv $TMP/depends.filter~ $TMP/depends.filter
- done
- mv $TMP/depends.filter $DEPENDS_STATUS
- cat $TMP/depends.new.* >> $DEPENDS_STATUS
- cp $DEPENDS_STATUS $DEPENDS_STATUS_BACKUP
- else
- if [ -z "$NOFIX" ] ; then
- if ! lin -c $MODULE ; then
- # put back the faulty depends so we know fixing this failed
- # and will be found again on the next run
- cat $TMP/depends > $DEPENDS_STATUS
- cp $DEPENDS_STATUS $DEPENDS_STATUS_BACKUP
- else
- # sometimes after lin all depends are gone! force it down it's throat
- cp $TMP/depends $TMP/depends.filter
- for MODULE in $CHANGED_MODULES ; do
- grep -v "^$MODULE:" $TMP/depends.filter > $TMP/depends.filter~
- mv $TMP/depends.filter~ $TMP/depends.filter
- done
- mv $TMP/depends.filter $DEPENDS_STATUS
- cat $TMP/depends.new.* >> $DEPENDS_STATUS
- cp $DEPENDS_STATUS $DEPENDS_STATUS_BACKUP
- fi
- fi
- fi
- remove_queue $INSTALL_QUEUE $MODULE
+ # special case: when called with --fixdepends, skip recompile!
+ cp $TMP/depends $TMP/depends.filter
+ for MODULE in $CHANGED_MODULES ; do
+ grep -v "^$MODULE:" $TMP/depends.filter > $TMP/depends.filter~
+ mv $TMP/depends.filter~ $TMP/depends.filter
+ done
+ mv $TMP/depends.filter $DEPENDS_STATUS
+ cat $TMP/depends.new.* >> $DEPENDS_STATUS
+ cp $DEPENDS_STATUS $DEPENDS_STATUS_BACKUP
done
-
- FIX=$OLD_FIX
- unset OLD_FIX
- export lin_PASS=$OLD_lin_PASS
fi
Index: download.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/download.lunar,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- download.lunar 10 Aug 2003 01:16:22 -0000 1.7
+++ download.lunar 14 Sep 2003 14:31:19 -0000 1.8
@@ -282,7 +282,7 @@
if [ "${1:0:6}" == "cvs://" ] ; then
# cvs urls
CVS_THRESHOLD=${CVS_THRESHOLD:-10}
- if [ "$CVS_THRESHOLD" > 0 ] ; then
+ if (( "$CVS_THRESHOLD" > 0 )) ; then
if [ ! -f "$2" ] ; then
get_cvs $1 $2
elif [ "$(find $2 -amin +$CVS_THRESHOLD)" == "$2" ] ; then
@@ -296,7 +296,7 @@
elif [ "${1:0:6}" == "svn://" ] ; then
# svn urls
SVN_THRESHOLD=${SVN_THRESHOLD:-10}
- if [ "SVN_THRESHOLD" > 0 ] ; then
+ if (( "SVN_THRESHOLD" > 0 )) ; then
if [ ! -f "$2" ] ; then
get_svn $1 $2
elif [ "$(find $2 -amin +$SVN_THRESHOLD)" == "$2" ] ; then
@@ -323,14 +323,14 @@
else
# ordinary URL's handled by fuzzy_wget
if [ -n "$BASE_URL" ] ; then
- URL=$BASE_URL/$(basename 2)
+ URL=$BASE_URL/$(basename $2)
fi
connect &&
if [ -n "$BASE_URL" ] ; then
fuzzy_wget $BASE_URL/$(basename $2) $2
elif ! fuzzy_wget $1 $2 ; then
if [ -n "$LRESORT_URL" ] ; then
- fuzzy_wget $LRESORT_URL/$(basename 2) $2
+ fuzzy_wget $LRESORT_URL/$(basename $2) $2
fi
fi
fi
Index: install.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/install.lunar,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- install.lunar 10 Aug 2003 01:18:55 -0000 1.1
+++ install.lunar 14 Sep 2003 14:31:19 -0000 1.2
@@ -279,12 +279,21 @@
if [ -f "$CACHE_BZ" ] && bzip2 -tf $CACHE_BZ ; then
message "${RESURRECT_COLOR}Resurrecting ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}version ${VERSION_COLOR}${VERSION}${DEFAULT_COLOR}"
bzip2 -cd $CACHE_BZ | tar -Pkx 1>/dev/null 2>&1
- add_module $MODULE $STATUS $VERSION
- verbose_msg "running \"lunar fix $MODULE\""
- run_fix $MODULE
- activity_log "lin" "$MODULE" "$VERSION" "success"
- message "${RESURRECT_COLOR}Resurrected ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}succesfully${DEFAULT_COLOR}"
+ add_module $MODULE $STATUS $VERSION &&
+ verbose_msg "running \"lunar fix $MODULE\"" &&
+ if run_fix $MODULE ; then
+ report $INSTALL_LOGS/$MODULE-$VERSION "install log" $MODULE $VERSION &&
+ sound SUCCESS
+ activity_log "lin" "$MODULE" "$VERSION" "success" "resurrected"
+ message "${RESURRECT_COLOR}Resurrected ${MODULE_COLOR}${MODULE}${DEFAULT_COLOR} ${MESSAGE_COLOR}succesfully${DEFAULT_COLOR}"
+ else
+ sound FAILURE
+ activity_log "lin" "$MODULE" "$VERSION" "failed" "resurrect failed"
+ false
+ fi
else
+ sound FAILURE
+ activity_log "lin" "$MODULE" "$VERSION" "failed" "resurrect failed"
false
fi
)
Index: optimize.lunar
===================================================================
RCS file: /var/cvs/lunar/lunar/var/lib/lunar/functions/optimize.lunar,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- optimize.lunar 10 Aug 2003 01:16:22 -0000 1.14
+++ optimize.lunar 14 Sep 2003 14:31:19 -0000 1.15
@@ -61,10 +61,10 @@
fi
if module_installed linux-openmosix; then
alias make="mosrun -h make"
- if [ "$MAKES" > 1 ] ]; then
+ if [[ "$MAKES" > 1 ]] ; then
alias make="mosrun -h make -j$MAKES"
fi
- elif [ "$MAKES" > 1 ] ; then
+ elif [[ $MAKES > 1 ]] ; then
alias make="make -j$MAKES"
fi
verbose_msg "make=\"$(which make)\", MAKES=\"$MAKES\""
@@ -582,8 +582,8 @@
optimize_stack() {
debug_msg "optimize_stack ($@)"
- if [[ $STACK > 0 ]]; then
- if [[ $PLATFORM == "x86" ]]; then
+ if [[ $STACK > 0 ]] ; then
+ if [ $PLATFORM == "x86" ] ; then
STACK="-mpreferred-stack-boundary=$STACK"
fi
CFLAGS="$CFLAGS $STACK"
More information about the Lunar-commits
mailing list