Bladeren bron

Make more similar to the way freedom-maker applies vmdebootstrap patches

Bob Mottram 9 jaren geleden
bovenliggende
commit
9a804ab375
3 gewijzigde bestanden met toevoegingen van 28 en 16 verwijderingen
  1. 0
    15
      src/freedombone-image
  2. 1
    1
      src/freedombone-image-makefile
  3. 27
    0
      src/freedombone-image-vmdebootstrap

+ 0
- 15
src/freedombone-image Bestand weergeven

@@ -169,21 +169,6 @@ cp -r /etc/${PROJECT_NAME}/* $BUILD_DIR
169 169
 chown -R $CURR_USER:$CURR_USER $BUILD_DIR
170 170
 cd $BUILD_DIR
171 171
 
172
-rm -rf vendor
173
-mkdir vendor
174
-if [ -d vendor/vmdebootstrap ] ; then
175
-    (cd vendor/vmdebootstrap; git checkout .; git pull)
176
-else
177
-    git clone $VMDEBOOTSTRAP_REPO vendor/vmdebootstrap
178
-fi
179
-cd vendor/vmdebootstrap
180
-git checkout tags/vmdebootstrap-${VMDEBOOTSTRAP_VERSION}
181
-git checkout -b tags/vmdebootstrap-${VMDEBOOTSTRAP_VERSION}
182
-for f in ../../vendor-patches/vmdebootstrap/* ; do
183
-    echo applying $(basename $f)
184
-    patch -p1 < $f
185
-done
186
-
187 172
 cd $BUILD_DIR
188 173
 make $IMAGE_TYPE \
189 174
     USERNAME="$USERNAME" \

+ 1
- 1
src/freedombone-image-makefile Bestand weergeven

@@ -165,7 +165,7 @@ test-virtualbox: virtualbox
165 165
 	VBoxManage unregistervm $(VM_NAME) --delete
166 166
 
167 167
 vendor/vmdebootstrap/vmdebootstrap: vendor-patches/vmdebootstrap/*.patch
168
-	bin/fetch-new-vmdebootstrap
168
+	freedombone-image-vmdebootstrap
169 169
 
170 170
 prep: vendor/vmdebootstrap/vmdebootstrap
171 171
 	mkdir -p build

+ 27
- 0
src/freedombone-image-vmdebootstrap Bestand weergeven

@@ -0,0 +1,27 @@
1
+#!/bin/sh
2
+#
3
+# This program is free software: you can redistribute it and/or modify
4
+# it under the terms of the GNU General Public License as published by
5
+# the Free Software Foundation, either version 3 of the License, or
6
+# (at your option) any later version.
7
+#
8
+# This program is distributed in the hope that it will be useful,
9
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
+# GNU General Public License for more details.
12
+#
13
+# You should have received a copy of the GNU General Public License
14
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
15
+
16
+mkdir -p vendor
17
+if [ -d vendor/vmdebootstrap ] ; then
18
+    (cd vendor/vmdebootstrap; git checkout .; git pull)
19
+else
20
+    git clone git://git.liw.fi/vmdebootstrap vendor/vmdebootstrap
21
+fi
22
+cd vendor/vmdebootstrap
23
+git checkout tags/vmdebootstrap-0.8
24
+for f in ../../vendor-patches/vmdebootstrap/* ; do
25
+    echo applying $(basename $f)
26
+    patch -p1 < $f
27
+done