Merge branch 'master' into python

Conflicts:
	make.sh
This commit is contained in:
Arne Fitzenreiter
2011-05-07 20:45:55 +02:00
8 changed files with 712 additions and 2 deletions

View File

@@ -689,13 +689,13 @@ buildipfire() {
ipfiremake swig
ipfiremake python-m2crypto
ipfiremake crda
ipfiremake libsatsolver
ipfiremake python-distutils-extra
ipfiremake python-lzma
ipfiremake python-progressbar
ipfiremake python-xattr
ipfiremake intltool
ipfiremake pakfire3-deps
echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
echo >> $BASEDIR/build/var/ipfire/firebuild