Merge branch 'master' into dracut

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

diff --git a/make.sh b/make.sh
index 7834e5a7d975b4f3d24e048a388125251af7251c..a00832c2781f7b2d8bc196ed78e35126c0654f39 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.7"                                                  # Version number
-CORE="39"                                                      # Core Level (Filename)
-PAKFIRE_CORE="38"                                              # Core Level (PAKFIRE)
+CORE="40"                                                      # Core Level (Filename)
+PAKFIRE_CORE="39"                                              # 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
@@ -373,9 +373,7 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
-  ipfiremake klibc
-  ipfiremake mkinitcpio
-  ipfiremake udev                      KLIBC=1
+  ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp