Merge branch 'master' of git://git.ipfire.org/ipfire-2.x

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

diff --git a/make.sh b/make.sh
index a3671e9e5abfdfb0a9f9ed97a27d68329e166484..77e3ba9bc4e50f823479f39f5885a154f1a526a6 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.8test"                                              # Version number
-CORE="43"                                                      # Core Level (Filename)
-PAKFIRE_CORE="42"                                              # Core Level (PAKFIRE)
+CORE="44"                                                      # Core Level (Filename)
+PAKFIRE_CORE="43"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
 CONFIG_ROOT=/var/ipfire                                                # Configuration rootdir
@@ -365,9 +365,9 @@ buildipfire() {
   ipfiremake dahdi                     XEN=1 KMOD=1
   ipfiremake cryptodev                 XEN=1
   ipfiremake compat-wireless           XEN=1
-  ipfiremake r8169                     XEN=1
-  ipfiremake r8168                     XEN=1
-  ipfiremake r8101                     XEN=1
+#  ipfiremake r8169                    XEN=1
+#  ipfiremake r8168                    XEN=1
+#  ipfiremake r8101                    XEN=1
   ipfiremake e1000                     XEN=1
   ipfiremake e1000e                    XEN=1
   ipfiremake igb                       XEN=1
@@ -381,9 +381,9 @@ buildipfire() {
   ipfiremake dahdi                     PAE=1 KMOD=1
   ipfiremake cryptodev                 PAE=1
   ipfiremake compat-wireless           PAE=1
-  ipfiremake r8169                     PAE=1
-  ipfiremake r8168                     PAE=1
-  ipfiremake r8101                     PAE=1
+#  ipfiremake r8169                    PAE=1
+#  ipfiremake r8168                    PAE=1
+#  ipfiremake r8101                    PAE=1
   ipfiremake e1000                     PAE=1
   ipfiremake e1000e                    PAE=1
   ipfiremake igb                       PAE=1
@@ -397,9 +397,9 @@ buildipfire() {
   ipfiremake dahdi                     KMOD=1
   ipfiremake cryptodev
   ipfiremake compat-wireless
-  ipfiremake r8169
-  ipfiremake r8168
-  ipfiremake r8101
+#  ipfiremake r8169
+#  ipfiremake r8168
+#  ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
   ipfiremake igb
@@ -417,6 +417,7 @@ buildipfire() {
   ipfiremake openssl
   ipfiremake curl
   ipfiremake python
+  ipfiremake fireinfo
   ipfiremake libnet
   ipfiremake libnl
   ipfiremake libidn
@@ -431,6 +432,7 @@ buildipfire() {
   ipfiremake slang
   ipfiremake newt
   ipfiremake attr
+  ipfiremake acl
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -518,6 +520,8 @@ buildipfire() {
   ipfiremake rrdtool
   ipfiremake setserial
   ipfiremake setup
+  ipfiremake libdnet
+  ipfiremake daq
   ipfiremake snort
   ipfiremake oinkmaster
   ipfiremake squid