denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't refer to recipes and images via $TESTDIR

Browse Source 
This way no symlink to the testing directory is required in $TESTDIR.
This commit is contained in:
Tobias Brunner
2013-01-17 16:54:57 +01:00
parent 7fa92110e8
commit 16cd6f63e2
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testing/scripts/build-guestimages
+1 -1
View File
@@ -54,7 +54,7 @@ do
if [ "$host" = "winnetou" ] if [ "$host" = "winnetou" ]
then then
execute "mkdir $LOOPDIR/var/log/apache2/ocsp" 0 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 "ln -s /etc/openssl/certs /var/www/certs" 0
execute_chroot "/etc/openssl/generate-crl" 0 execute_chroot "/etc/openssl/generate-crl" 0
execute_chroot "update-rc.d apache2 defaults" 0 execute_chroot "update-rc.d apache2 defaults" 0
testing/scripts/build-rootimage
+1 -1
View File
@@ -50,7 +50,7 @@ execute "mount -o bind $ROOTIMGCOMPILEDIR $LOOPDIR/root/compile"
do_on_exit umount $LOOPDIR/root/compile do_on_exit umount $LOOPDIR/root/compile
echo "Installing software from source" echo "Installing software from source"
RECPDIR=$TESTDIR/testing/scripts/recipes RECPDIR=$PWD/scripts/recipes
RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename` RECIPES=`ls $RECPDIR/*.mk | xargs -n1 basename`
execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0 execute "cp -r $RECPDIR/patches $LOOPDIR/root/compile" 0
for r in $RECIPES for r in $RECIPES