Imported the beginning of the rowie-spezial and possible 2.2 release.

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

diff --git a/make.sh b/make.sh
index bc6b22f28f67c7364122dd5d67406b879d94e62d..212c8ee4ce3faf827e9188c12086779e26a7a180 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.1"                                                                          # Version number
+VERSION="2.2-test"                                                                             # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -336,20 +336,22 @@ buildipfire() {
   ipfiremake zaptel                    SMP=1
   ipfiremake r8169                     SMP=1
   ipfiremake r8168                     SMP=1
-  ipfiremake mcs7830                   SMP=1
+  #ipfiremake mcs7830                  SMP=1
   ipfiremake atl1                      SMP=1
-  ipfiremake dm9601                    SMP=1
+  #ipfiremake dm9601                   SMP=1
   ipfiremake kqemu                     SMP=1
+  ipfiremake v4l-dvb                   SMP=1
   ipfiremake sane              KMOD=1  SMP=1
   ipfiremake linux
   ipfiremake ipp2p
   ipfiremake zaptel
   ipfiremake r8169
   ipfiremake r8168
-  ipfiremake mcs7830
+  #ipfiremake mcs7830
   ipfiremake atl1
-  ipfiremake dm9601
+  #ipfiremake dm9601
   ipfiremake kqemu
+  ipfiremake v4l-dvb
   ipfiremake sane              KMOD=1
   ipfiremake pkg-config
   ipfiremake linux-atm
@@ -517,7 +519,6 @@ buildipfire() {
   ipfiremake mpc
   ipfiremake xvid
   ipfiremake libmpeg2
-  ipfiremake videolan
   ipfiremake cmake
   ipfiremake libpri
   ipfiremake asterisk
@@ -565,11 +566,14 @@ buildipfire() {
   ipfiremake arptables
   ipfiremake fontconfig
   ipfiremake freefont
+  ipfiremake ffmpeg
+  ipfiremake videolan
   ipfiremake vdr
   ipfiremake w_scan
   ipfiremake git
   ipfiremake squidclamav
   ipfiremake bc
+  ipfiremake esniper
 }
 
 buildinstaller() {
@@ -666,7 +670,7 @@ buildpackages() {
 }
 
 ipfirepackages() {
-       ipfiremake core-updates
+       #ipfiremake core-updates
        for i in $(ls -1 $BASEDIR/config/rootfiles/packages); do
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i