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 0d55a9b633362b5e55fc3a424ea047ee0c09cd51..1c47706ada6af3ea02176c4b44fe919329bf8d86 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -24,8 +24,8 @@
 
 NAME="IPFire"                                                                          # Software name
 SNAME="ipfire"                                                                 # Short name
-VERSION="2.2-test"
-GIT_BRANCH=rspezial:rspezial                                                                           # Version number
+VERSION="2.3"
+GIT_BRANCH=master:master                                                                               # Version number
 SLOGAN="www.ipfire.org"                                        # Software slogan
 CONFIG_ROOT=/var/ipfire                                        # Configuration rootdir
 NICE=10                                                                                                        # Nice level
@@ -583,6 +583,7 @@ buildipfire() {
   ipfiremake vnstati
   ipfiremake wpa_supplicant
   ipfiremake hostapd
+  ipfiremake urlgrabber
 }
 
 buildinstaller() {
@@ -682,7 +683,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