Changes in builder/runrooted [d2a077a:0c25615]

File:

• builder/runrooted (modified) (2 diffs)

builder/runrooted

@@ -83 +83 @@
         NEEDS=`../npl/findbuilddeps $PGMPATH` || exit 1
         for NEED in $NEEDS; do
+                #already installed?
+                if grep -x "$NEED" ../npl/buildroot.list >/dev/null; then
+                        continue
+                fi
 
                 CONFIG=1
-                echo -n "Finding dependency $NEED: "
+                echo -n "Build-dependency $NEED installeren: "
                 TGZ=`../npl/findpkg "$NEED"` || exit 1
-                echo -n "$TGZ"
-                
-                PKGNAME=`basename "$TGZ"|sed 's/.tgz$//'`
-
-                #already installed?
-                if [ -e "$BUILDROOT/var/log/packages/$PKGNAME" ]; then
-                        echo " (already installed, skipping)"
-                        continue
-                else
-                        echo " (installing)"
-                fi
+                echo "$TGZ"
 
                 #Bepaal waar het pakketje in de buildroot moet terecht komen, ivm crosscompiling.
@@ -229 +223 @@
 mv $WORKDIR/*.version $DIR || exit 1
 
-#copy check if pkg file is different and update build number when needed
+#move packages from buildroot to workdir
 for PKG in $WORKDIR/*.pkg; do
         NAME=`basename $PKG|sed 's/.pkg$//g'`
         if ! cmp $PKG $DIR/$NAME.pkg; then
-                BUILD=`cat $DIR/$NAME.build 2>/dev/null`
-                if [ "$BUILD" == "" ]; then
-                        BUILD=1
-                else
-                        (( BUILD=BUILD+1 ))
-                fi
-                echo "$PKG was rebuilded, build $BUILD"
                 mv $PKG $DIR || exit 1
-                echo $BUILD > $DIR/$NAME.build || exit 1
         fi
 done