X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=1d760a204eaa18908d7c25bf689744be1e952e4a;hb=087cc6113c16e6f525bfb3d9561fc96f11ac2fdd;hp=671989b89935c445b75c75c7ed089c66d263f82f;hpb=4bdb372a5c31f8ed5b124176f9102ef69f33780f;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 671989b899..1d760a204e 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.9"							# 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
@@ -247,6 +247,7 @@ buildtoolchain() {
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
     export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
     lfsmake1 ccache	PASS=1
+    lfsmake1 make	PASS=1
     lfsmake1 binutils	PASS=1
     lfsmake1 gcc		PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -270,7 +271,7 @@ buildtoolchain() {
     lfsmake1 grep
     lfsmake1 gzip
     lfsmake1 m4
-    lfsmake1 make
+    lfsmake1 make	PASS=2
     lfsmake1 patch
     lfsmake1 perl
     lfsmake1 sed
@@ -689,13 +690,14 @@ buildipfire() {
   ipfiremake swig
   ipfiremake python-m2crypto
   ipfiremake crda
+  ipfiremake libsatsolver
+  ipfiremake python-satsolver
   ipfiremake python-distutils-extra
   ipfiremake python-lzma
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
   ipfiremake pakfire3-deps
-
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild