Added nut (Network Ups Tools).

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index ed07b495408f5f2bcaf586dfc2015d3cbac02cd3..d56ee48ef5e46f79c0dbcb94cfe6b614e98d962d 100755 (executable)
--- 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 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 openswan                  XEN=1 KMOD=1
+  ipfiremake mISDN                     XEN=1
+  ipfiremake compat-wireless           XEN=1
   ipfiremake linux
   ipfiremake atl2
   ipfiremake hso
@@ -605,14 +605,14 @@ buildipfire() {
   ipfiremake sshfs
   ipfiremake sqlite
   ipfiremake taglib
-#  ipfiremake mediatomb
+  ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake vdradmin
 #  ipfiremake x11libs
 #  ipfiremake xen
   ipfiremake miau
-  ipfiremake net-snmp
+  ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
   ipfiremake lcr
@@ -622,6 +622,8 @@ buildipfire() {
   ipfiremake nagiosql
   ipfiremake iftop
   ipfiremake motion
+  ipfiremake joe
+  ipfiremake nut
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -715,8 +717,10 @@ buildpackages() {
   # 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/
+        cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
        ipfiremake xen-image ED=$IPFVER
        rm -rf $LFS/install/packages/linux-xen-*.ipfire
+       rm -rf $LFS/install/packages/meta-linux-xen
   fi
   mv $LFS/install/images/*.bz2 $BASEDIR >> $LOGFILE 2>&1