X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=331942a67b78a84cfb78fd951ea782d9c4821d36;hp=2eb019e39c387f273eb3fcf9ee45e8b19c2b4499;hb=08098df2d70702d5fdbcb8af7ffa048d63b8a7ac;hpb=c34f282e79353f65045d6d7ebb7c1fbcc84eac73 diff --git a/make.sh b/make.sh index 2eb019e39c..331942a67b 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.5" -CORE="29" +CORE="30" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -340,6 +340,8 @@ buildipfire() { ipfiremake which ipfiremake linux XEN=1 ipfiremake atl2 XEN=1 + ipfiremake hso XEN=1 + ipfiremake e1000e XEN=1 ipfiremake kqemu XEN=1 ipfiremake v4l-dvb XEN=1 ipfiremake madwifi XEN=1 @@ -349,6 +351,8 @@ buildipfire() { ipfiremake compat-wireless XEN=1 ipfiremake linux ipfiremake atl2 + ipfiremake hso + ipfiremake e1000e ipfiremake kqemu ipfiremake v4l-dvb ipfiremake madwifi @@ -605,8 +609,8 @@ buildipfire() { ipfiremake sslh ipfiremake perl-gettext ipfiremake vdradmin - ipfiremake x11libs - ipfiremake xen +# ipfiremake x11libs +# ipfiremake xen ipfiremake miau ipfiremake net-snmp ipfiremake perl-DBI @@ -697,7 +701,7 @@ buildpackages() { # Create images for install ipfiremake cdrom ED=$IPFVER - + # Check if there is a loop device for building in virtual environments if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then ipfiremake usb-stick ED=$IPFVER @@ -708,6 +712,14 @@ buildpackages() { ipfirepackages + # Check if there is a loop device for building in virtual environments + if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then + cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/ + ipfiremake xen-image ED=$IPFVER + rm -rf $LFS/install/packages/linux-xen-*.ipfire + fi + mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1 + # Cleanup stdumount rm -rf $BASEDIR/build/tmp/*