From 7ebac4fd31594071cb0f1af871f81f244c68e232 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <ian@iandouglasscott.com>
Date: Sun, 9 Jul 2017 09:27:24 -0700
Subject: [PATCH 1/2] Revert "Attempt to work around jenkins issue"

This reverts commit 1a67b4b2ff9b083c24633327998680b3d941824e.
---
 cook.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cook.sh b/cook.sh
index ece2d1042..4a9ab7831 100755
--- a/cook.sh
+++ b/cook.sh
@@ -95,19 +95,19 @@ function op {
             fi
             ;;
         prepare)
-            rm -rf sysroot
-            mkdir sysroot
+	    rm -rf sysroot
+	    mkdir sysroot
 
             if [ ${#BUILD_DEPENDS} -gt 0 ]
             then
-              for i in "${BUILD_DEPENDS[@]}"
-              do
-                pushd "$ROOT"
-                  ./repo.sh "$i"
-                popd
+                pushd $ROOT
+	            ./repo.sh ${BUILD_DEPENDS}
+	        popd
 
-                CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- --target=$TARGET install --root sysroot "$REPO/$i.tar.gz"
-              done
+                for i in "${BUILD_DEPENDS[@]}"
+		do
+                    CC=cc cargo run --release --manifest-path "$ROOT/pkgutils/Cargo.toml" --bin pkg -- --target=$TARGET install --root sysroot "$REPO/$i.tar.gz"
+                done
             fi
 
             rm -rf build

From b0e362c35369fc21ef0e04d39f812737d5ea0177 Mon Sep 17 00:00:00 2001
From: Ian Douglas Scott <ian@iandouglasscott.com>
Date: Sun, 9 Jul 2017 09:27:56 -0700
Subject: [PATCH 2/2] Fix repo.sh call for build depends

---
 cook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cook.sh b/cook.sh
index 4a9ab7831..a4f1b0bff 100755
--- a/cook.sh
+++ b/cook.sh
@@ -101,7 +101,7 @@ function op {
             if [ ${#BUILD_DEPENDS} -gt 0 ]
             then
                 pushd $ROOT
-	            ./repo.sh ${BUILD_DEPENDS}
+	            ./repo.sh "${BUILD_DEPENDS[@]}"
 	        popd
 
                 for i in "${BUILD_DEPENDS[@]}"