From 16cd6f63e29fd1597804c167c68f103ca20cbf5e Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Thu, 13 Dec 2012 18:59:25 +0100 Subject: Don't refer to recipes and images via $TESTDIR This way no symlink to the testing directory is required in $TESTDIR. --- testing/scripts/build-guestimages | 2 +- testing/scripts/build-rootimage | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'testing') 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 -- cgit v1.2.3