From 14f245c980827ad854c9e7518c16104d12fe117a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 6 Sep 2016 11:29:34 +0100 Subject: [PATCH] Use a different vmdebootstrap repo --- man/freedombone-image.1.gz | Bin 3746 -> 3755 bytes src/freedombone-image-vmdebootstrap | 11 +++++------ 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz index 6b14b0007a5585bfb0156855bd7efd383f3e6a67..c60301fdbd288ba1561c30e5326ff9b8a5c2e227 100644 GIT binary patch delta 3050 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 diff --git a/src/freedombone-image-vmdebootstrap b/src/freedombone-image-vmdebootstrap index f9e3d43a..bb0f3220 100755 --- a/src/freedombone-image-vmdebootstrap +++ b/src/freedombone-image-vmdebootstrap @@ -31,11 +31,14 @@ PROJECT_NAME='freedombone' export TEXTDOMAIN=${PROJECT_NAME}-image-vmdebootstrap export TEXTDOMAINDIR="/usr/share/locale" +VMDEBOOTSTRAP_REPO="https://github.com/bashrc/vmdebootstrap" +VMDEBOOTSTRAP_COMMIT='bashrc/freedombone' + 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 + git clone $VMDEBOOTSTRAP_REPO vendor/vmdebootstrap fi if [ ! -d /usr/share/distro-info ]; then @@ -101,8 +104,4 @@ EOF fi cd vendor/vmdebootstrap -git checkout tags/vmdebootstrap-0.8 -b tags/vmdebootstrap-0.8 -for f in ../../vendor-patches/vmdebootstrap/* ; do - echo applying $(basename $f) - patch -p1 < $f -done +git checkout $VMDEBOOTSTRAP_COMMIT -b $VMDEBOOTSTRAP_COMMIT