diff options
| author | Tobias Brunner <tobias@strongswan.org> | 2012-12-13 18:59:25 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2013-01-17 16:54:57 +0100 |
| commit | 16cd6f63e29fd1597804c167c68f103ca20cbf5e (patch) | |
| tree | 3a98e83f81bd42be3f2585b030d5516ccbcfcc7b /testing | |
| parent | 7fa92110e82e3cabb8060dfef0bcec538083454d (diff) | |
| download | strongswan-16cd6f63e29fd1597804c167c68f103ca20cbf5e.tar.bz2 strongswan-16cd6f63e29fd1597804c167c68f103ca20cbf5e.tar.xz | |
Don't refer to recipes and images via $TESTDIR
This way no symlink to the testing directory is required in $TESTDIR.
Diffstat (limited to 'testing')
| -rwxr-xr-x | testing/scripts/build-guestimages | 2 | ||||
| -rwxr-xr-x | testing/scripts/build-rootimage | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/testing/scripts/build-guestimages b/testing/scripts/build-guestimages index 5186b8a6a..bf6d21d08 100755 --- a/testing/scripts/build-guestimages +++ b/testing/scripts/build-guestimages @@ -54,7 +54,7 @@ do if [ "$host" = "winnetou" ] then execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 - execute "cp -rf $TESTDIR/testing/images $LOOPDIR/var/www/" 0 + execute "cp -rf $PWD/images $LOOPDIR/var/www/" 0 execute_chroot "ln -s /etc/openssl/certs /var/www/certs" 0 execute_chroot "/etc/openssl/generate-crl" 0 execute_chroot "update-rc.d apache2 defaults" 0 diff --git a/testing/scripts/build-rootimage b/testing/scripts/build-rootimage index 3fe8ace49..8d3f32bbc 100755 --- a/testing/scripts/build-rootimage +++ b/testing/scripts/build-rootimage @@ -50,7 +50,7 @@ execute "mount -o bind $ROOTIMGCOMPILEDIR $LOOPDIR/root/compile" do_on_exit umount $LOOPDIR/root/compile echo "Installing software from source" -RECPDIR=$TESTDIR/testing/scripts/recipes +RECPDIR=$PWD/scripts/recipes RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename` execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0 for r in $RECIPES |