Merge branch 'master' into next

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

diff --git a/make.sh b/make.sh
index 5f595e86f2e8dbf8689402ce568be037aaf29a29..ba25ec3b476000140df7e2d024c62ff5d4dceeb8 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.10"                                                 # Version number
-CORE="49"                                                      # Core Level (Filename)
-PAKFIRE_CORE="48"                                              # Core Level (PAKFIRE)
+CORE="50"                                                      # Core Level (Filename)
+PAKFIRE_CORE="49"                                              # 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
@@ -690,6 +690,7 @@ buildipfire() {
   ipfiremake parted
   ipfiremake swig
   ipfiremake python-m2crypto
+  ipfiremake wireless-regdb
   ipfiremake crda
   ipfiremake libsatsolver
   ipfiremake python-satsolver