Merge branch 'rspezial'

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

diff --git a/make.sh b/make.sh
index 1ce7c6924b2aff9772da7e5b98cdae90ed8cf911..04a348c05678ca1fbe665ae836d7b25bcfeba51c 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -341,6 +341,7 @@ buildipfire() {
   ipfiremake atl1                      SMP=1
   ipfiremake kqemu                     SMP=1
   ipfiremake v4l-dvb                   SMP=1
+  ipfiremake madwifi                    SMP=1
   ipfiremake sane              KMOD=1  SMP=1
   ipfiremake linux
   ipfiremake linux-fusion
@@ -351,6 +352,7 @@ buildipfire() {
   ipfiremake atl1
   ipfiremake kqemu
   ipfiremake v4l-dvb
+  ipfiremake madwifi
   ipfiremake sane              KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -417,7 +419,6 @@ buildipfire() {
   ipfiremake libupnp
   ipfiremake ipp2p                     IPT=1
   ipfiremake linux-igd
-  ipfiremake ipac-ng
   ipfiremake ipaddr
   ipfiremake iptstate
   ipfiremake iputils
@@ -509,6 +510,7 @@ buildipfire() {
   ipfiremake libmad
   ipfiremake libogg
   ipfiremake libvorbis
+  ipfiremake libdvbpsi
   ipfiremake lame
   ipfiremake sox
   ipfiremake libshout
@@ -534,7 +536,6 @@ buildipfire() {
   ipfiremake portmap
   ipfiremake nfs
   ipfiremake nmap
-  ipfiremake mbmon
   ipfiremake ncftp
   ipfiremake etherwake
   ipfiremake bwm-ng
@@ -555,6 +556,7 @@ buildipfire() {
   ipfiremake teamspeak
   ipfiremake elinks
   ipfiremake igmpproxy
+  ipfiremake fbset
   ipfiremake sdl
   ipfiremake qemu
   ipfiremake sane
@@ -566,6 +568,8 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake directfb
+  ipfiremake dfb++
   ipfiremake ffmpeg
   ipfiremake videolan
   ipfiremake vdr
@@ -574,9 +578,11 @@ buildipfire() {
   ipfiremake squidclamav
   ipfiremake bc
   ipfiremake esniper
+  ipfiremake mod_perl
   ipfiremake vnstat
   ipfiremake vnstati
-}
+  ipfiremake wpa_supplicant
+  ipfiremake hostapd}
 
 buildinstaller() {
   # Run installer scripts one by one
@@ -647,10 +653,10 @@ buildpackages() {
   if [ -e /dev/loop/0 ] || [ -e /dev/loop0 ]; then
        ipfiremake usb-stick
   fi
-  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz} $BASEDIR >> $LOGFILE 2>&1
 
   # Create updater package
   ipfiremake updater
+  mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages