From 9a804ab37573d21c08890681aa19553b58c7d9d6 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sun, 22 Nov 2015 10:36:11 +0000
Subject: [PATCH] Make more similar to the way freedom-maker applies
 vmdebootstrap patches

---
 src/freedombone-image               | 15 ---------------
 src/freedombone-image-makefile      |  2 +-
 src/freedombone-image-vmdebootstrap | 27 +++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 16 deletions(-)
 create mode 100755 src/freedombone-image-vmdebootstrap

diff --git a/src/freedombone-image b/src/freedombone-image
index 4bc6dee4..555e7413 100755
--- a/src/freedombone-image
+++ b/src/freedombone-image
@@ -169,21 +169,6 @@ cp -r /etc/${PROJECT_NAME}/* $BUILD_DIR
 chown -R $CURR_USER:$CURR_USER $BUILD_DIR
 cd $BUILD_DIR
 
-rm -rf vendor
-mkdir vendor
-if [ -d vendor/vmdebootstrap ] ; then
-    (cd vendor/vmdebootstrap; git checkout .; git pull)
-else
-    git clone $VMDEBOOTSTRAP_REPO vendor/vmdebootstrap
-fi
-cd vendor/vmdebootstrap
-git checkout tags/vmdebootstrap-${VMDEBOOTSTRAP_VERSION}
-git checkout -b tags/vmdebootstrap-${VMDEBOOTSTRAP_VERSION}
-for f in ../../vendor-patches/vmdebootstrap/* ; do
-    echo applying $(basename $f)
-    patch -p1 < $f
-done
-
 cd $BUILD_DIR
 make $IMAGE_TYPE \
     USERNAME="$USERNAME" \
diff --git a/src/freedombone-image-makefile b/src/freedombone-image-makefile
index ec424884..ecbafbce 100755
--- a/src/freedombone-image-makefile
+++ b/src/freedombone-image-makefile
@@ -165,7 +165,7 @@ test-virtualbox: virtualbox
 	VBoxManage unregistervm $(VM_NAME) --delete
 
 vendor/vmdebootstrap/vmdebootstrap: vendor-patches/vmdebootstrap/*.patch
-	bin/fetch-new-vmdebootstrap
+	freedombone-image-vmdebootstrap
 
 prep: vendor/vmdebootstrap/vmdebootstrap
 	mkdir -p build
diff --git a/src/freedombone-image-vmdebootstrap b/src/freedombone-image-vmdebootstrap
new file mode 100755
index 00000000..603296f3
--- /dev/null
+++ b/src/freedombone-image-vmdebootstrap
@@ -0,0 +1,27 @@
+#!/bin/sh
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+mkdir -p vendor
+if [ -d vendor/vmdebootstrap ] ; then
+    (cd vendor/vmdebootstrap; git checkout .; git pull)
+else
+    git clone git://git.liw.fi/vmdebootstrap vendor/vmdebootstrap
+fi
+cd vendor/vmdebootstrap
+git checkout tags/vmdebootstrap-0.8
+for f in ../../vendor-patches/vmdebootstrap/* ; do
+    echo applying $(basename $f)
+    patch -p1 < $f
+done