use -C for make instead of changing current directory

diff --git a/update_stage0.sh b/update_stage0.sh
index 40bb517f6884bca624e0bdd7c02186be73aa0c97..31edbce9a77de1551d279bd30b630334ee1c3a33 100755 (executable)
--- a/update_stage0.sh
+++ b/update_stage0.sh
@@ -39,6 +39,8 @@ parse() {
 jarg=`sysctl -n hw.ncpu`
 
 
+usrsrc=${USRSRC:-/usr/src}
+
 if [ $? -ne 0 ] 
 then 
        usage 
@@ -48,7 +50,7 @@ fi
 
 if [ ${UPDATE:=-0} -eq 1 ]; then 
        echo "updating ..." 
-       svn update /usr/src
+       svnlite update ${usrsrc}
        [ ${?} == 1 ] && exit 1
 fi
 
@@ -59,7 +61,6 @@ if [ ${CLEANING:=-0} -eq 1 ]; then
 fi
 
 echo building process on ${jarg} jobs
-cd /usr/src && make -j${jarg} buildworld && make -j${jarg} kernel KERNCONF=PEPINS \
+make -C ${usrsrc} -j${jarg} buildworld && make -C ${usrsrc} -j${jarg} kernel KERNCONF=PEPINS \
        && echo "Reboot the system."
 
-

diff --git a/update_stage1.sh b/update_stage1.sh
index c4a04422d12c618671af0c54125a3eae7e15e38f..d85ecbf126f45ce850f93a6fef06de6cdfd92763 100755 (executable)
--- a/update_stage1.sh
+++ b/update_stage1.sh
@@ -11,10 +11,13 @@ adjkerntz -i
 
 mountro=`zfs get -H readonly llroot/ROOT/master | cut -w -f 3`
 [ ${mountro} = "on" ] && zfs_mount
-mergemaster -p
-cd /usr/src && \
-make installworld && \
+usrsrc=${USRSRC:-/usr/src}
+
+mergemaster -p && \
+make -C ${usrsrc} installworld && \
 mergemaster -iF && \
-make delete-old && \
+make -C ${usrsrc} delete-old && \
 echo "reboot to delete old libs"
+# make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old
+# make -C ${usrsrc} -DBATCH_DELETE_OLD_FILES delete-old-libs
 

diff --git a/update_stagep.sh b/update_stagep.sh
index 2aa9dd1323bc28779110ddf7e910f2a31cf60d0c..eb2fa22925dae30f2e55b46823886373e16c693f 100755 (executable)
--- a/update_stagep.sh
+++ b/update_stagep.sh
@@ -44,13 +44,18 @@ fi
 
 if [ ${UPDATE:=-0} -eq 1 ]; then
        echo "Updating port Tree"
-       poudriere ports -p HEAD -u && portsnap auto
+       poudriere ports -p HEAD -u 
 fi
 
-echo "building lapinbilly"
+echo ------------------------------------------------------------------
+echo                         building lapinbilly
+echo ..................................................................
 
-poudriere bulk -J ${jarg}:2   -j lapinbilly -p HEAD -f /usr/local/etc/poudriere.d/port-list
+poudriere bulk -J ${jarg}:2   -j owncloud -p HEAD -f /usr/local/etc/poudriere.d/lp-list
 
-echo "building llanura"
+echo
+echo ------------------------------------------------------------------
+echo                         building llanura
+echo ..................................................................
 
-poudriere bulk -J ${jarg}:2   -j release11 -p HEAD -f /usr/local/etc/poudriere.d/port-list-llanura
+poudriere bulk -J ${jarg}:2   -j release11 -p HEAD -f /usr/local/etc/poudriere.d/llanura-list