X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=7f68f293d461440e3dd4dcaea65f728f738c8080;hp=331942a67b78a84cfb78fd951ea782d9c4821d36;hb=2ca7e12e9e37f35c5a6a549f5598cd4cd519b9c8;hpb=bf61eef0bb59b7e197595dfd8526bf945b20a933 diff --git a/make.sh b/make.sh index 331942a67b..7f68f293d4 100755 --- a/make.sh +++ b/make.sh @@ -25,7 +25,7 @@ NAME="IPFire" # Software name SNAME="ipfire" # Short name VERSION="2.5" -CORE="30" +CORE="31" GIT_BRANCH=master:master # Version number SLOGAN="www.ipfire.org" # Software slogan CONFIG_ROOT=/var/ipfire # Configuration rootdir @@ -338,17 +338,17 @@ buildipfire() { ipfiremake pptp ipfiremake unzip 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 -# ipfiremake alsa XEN=1 KMOD=1 - ipfiremake openswan XEN=1 KMOD=1 - ipfiremake mISDN XEN=1 - ipfiremake compat-wireless XEN=1 +# 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 +## ipfiremake alsa XEN=1 KMOD=1 +# ipfiremake openswan XEN=1 KMOD=1 +# ipfiremake mISDN XEN=1 +# ipfiremake compat-wireless XEN=1 ipfiremake linux ipfiremake atl2 ipfiremake hso @@ -712,13 +712,13 @@ 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 +# # 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