Merge remote-tracking branch 'origin/next' into thirteen

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

diff --git a/make.sh b/make.sh
index 1995836a43c7de1fbe6319892da2cd235ea4100b..55684d5742aaa0011feaed6e3e160378f9ddecb1 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,7 +25,7 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.13"                                                 # Version number
-CORE="63"                                                      # Core Level (Filename)
+CORE="64"                                                      # Core Level (Filename)
 PAKFIRE_CORE="63"                                              # Core Level (PAKFIRE)
 GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`             # Git Branch
 SLOGAN="www.ipfire.org"                                                # Software slogan
@@ -372,6 +372,7 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake linux-firmware
+  ipfiremake dvb-firmwares
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
   ipfiremake u-boot
@@ -393,7 +394,7 @@ buildipfire() {
 
     # x86-pae (Native and new XEN) kernel build
     ipfiremake linux                   KCFG="-pae"
-#    ipfiremake kvm-kmod                       KCFG="-pae"
+    ipfiremake kvm-kmod                        KCFG="-pae"
     ipfiremake v4l-dvb                 KCFG="-pae"
     ipfiremake alsa                    KCFG="-pae" KMOD=1
     ipfiremake mISDN                   KCFG="-pae"
@@ -407,7 +408,7 @@ buildipfire() {
 
     # x86 kernel build
     ipfiremake linux                   KCFG=""
-#    ipfiremake kvm-kmod                       KCFG=""
+    ipfiremake kvm-kmod                        KCFG=""
     ipfiremake v4l-dvb                 KCFG=""
     ipfiremake alsa                    KCFG="" KMOD=1
     ipfiremake mISDN                   KCFG=""
@@ -518,7 +519,6 @@ buildipfire() {
   ipfiremake mISDNuser
   ipfiremake capi4k-utils
   ipfiremake hwdata
-  ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
@@ -737,7 +737,6 @@ buildipfire() {
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
-  ipfiremake pakfire3-deps
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
@@ -751,6 +750,7 @@ buildipfire() {
   ipfiremake libassuan
   ipfiremake gpgme
   ipfiremake pygpgme
+  ipfiremake pakfire3
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -760,11 +760,14 @@ buildipfire() {
   echo >> $BASEDIR/build/var/ipfire/firebuild
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
-  if [ "$GIT_BRANCH" = "master" -o "$GIT_BRANCH" = "next" ]; then
-       echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
-  else
-       echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
-  fi
+  case "$GIT_BRANCH" in
+       core*)
+           echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+           ;;
+       *)
+           echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
+           ;;
+  esac
 }
 
 buildinstaller() {
@@ -863,7 +866,7 @@ ipfirepackages() {
        ipfiremake core-updates
 
        local i
-       for i in $(find $BASEDIR/config/rootfiles/packages{${machine},} -maxdepth 1 -type f); do
+       for i in $(find $BASEDIR/config/rootfiles/packages{/${MACHINE},} -maxdepth 1 -type f); do
                i=$(basename ${i})
                if [ -e $BASEDIR/lfs/$i ]; then
                        ipfiredist $i