[PATCH v2 2/7] buildscript: allow feed without url

Tim Niemeyer tim.niemeyer at mastersword.de
So Dez 6 13:42:17 CET 2015


Signed-off-by: Tim Niemeyer <tim.niemeyer at mastersword.de>
---

Changes in v2:
- do not clean the included package feed

 buildscript | 40 +++++++++++++++++++++++-----------------
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/buildscript b/buildscript
index 862c49d..f63309a 100755
--- a/buildscript
+++ b/buildscript
@@ -91,22 +91,24 @@ get_source() {
         local URL=${FEED[1]}
         local REV=${FEED[2]}
 
-        checkout_git "$NAME" "$URL" "$REV"
-
-        # Patches for feeds could be stored in known directories like build_patches/$NAME/
-        # That way multiple patches for one feed could be supported
-        count=3
-        while [ "x${FEED[count]}" != "x" ]
-        do
-            local PATCH=${FEED[count]}
-            if [ ! -z "$PATCH" ] ; then
-                echo "Patching $PATCH"
-                git -C "$NAME" am --whitespace=nowarn "$PATCH"
-            else
-                echo "Warning, $PATCH not found."
-            fi
-            count=$(( count + 1 ))
-        done
+        if [ -n "$URL" -a -n "$REV" ]; then
+            checkout_git "$NAME" "$URL" "$REV"
+
+            # Patches for feeds could be stored in known directories like build_patches/$NAME/
+            # That way multiple patches for one feed could be supported
+            count=3
+            while [ "x${FEED[count]}" != "x" ]
+            do
+                local PATCH=${FEED[count]}
+                if [ ! -z "$PATCH" ] ; then
+                    echo "Patching $PATCH"
+                    git -C "$NAME" am --whitespace=nowarn "$PATCH"
+                else
+                    echo "Warning, $PATCH not found."
+                fi
+                count=$(( count + 1 ))
+            done
+        fi
     done
 
     cd .. # packages
@@ -282,8 +284,12 @@ clean() {
         FEED=("${!FEED}")
 
         local NAME=${FEED[0]}
+        local URL=${FEED[1]}
+        local REV=${FEED[2]}
 
-        /bin/rm -rf src/packages/"$NAME"
+        if [ -n "$URL" -a -n "$REV" ]; then
+            /bin/rm -rf src/packages/"$NAME"
+        fi
     done
 }
 
-- 
2.1.4




Mehr Informationen über die Mailingliste franken-dev