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

This commit is contained in:
Bob Mottram 2015-11-22 10:36:11 +00:00
parent bff65b86d1
commit 9a804ab375
3 changed files with 28 additions and 16 deletions

View File

@ -169,21 +169,6 @@ cp -r /etc/${PROJECT_NAME}/* $BUILD_DIR
chown -R $CURR_USER:$CURR_USER $BUILD_DIR chown -R $CURR_USER:$CURR_USER $BUILD_DIR
cd $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 cd $BUILD_DIR
make $IMAGE_TYPE \ make $IMAGE_TYPE \
USERNAME="$USERNAME" \ USERNAME="$USERNAME" \

View File

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

View File

@ -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