Merge branch 'next' of ssh://arne_f@git.ipfire.org/pub/git/ipfire-2.x into next

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

diff --git a/make.sh b/make.sh
index 15ab38b72cfe76736ac72196cd7457c9ff34b4d5..c65ad5a22cdb429616fd375b18788d416eb9bd90 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"                                                  # Software name
 SNAME="ipfire"                                                 # Short name
 VERSION="2.11"                                                 # Version number
-CORE="53"                                                      # Core Level (Filename)
-PAKFIRE_CORE="52"                                              # Core Level (PAKFIRE)
+CORE="54"                                                      # Core Level (Filename)
+PAKFIRE_CORE="53"                                              # 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
@@ -71,14 +71,6 @@ mkdir $BASEDIR/log/ 2>/dev/null
 
 if [ -f .config ]; then
        . .config
-else
-       echo -e  "${BOLD}No configuration found!${NORMAL}"
-       echo -ne "Do you want to create one (y/N)?"
-       read CREATE_CONFIG
-       echo ""
-       if [ "$CREATE_CONFIG" == "y" ]; then
-               make_config
-       fi
 fi
 
 if [ -z $EDITOR ]; then
@@ -301,6 +293,7 @@ buildbase() {
     fi
     lfsmake2 man-pages
     lfsmake2 glibc
+    lfsmake2 tzdata
     lfsmake2 cleanup-toolchain PASS=3
     lfsmake2 binutils
     lfsmake2 gcc
@@ -375,59 +368,59 @@ buildipfire() {
 
   # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
-    ipfiremake linux                   XEN=1
-    ipfiremake kqemu                   XEN=1
-    ipfiremake v4l-dvb                 XEN=1
-    ipfiremake madwifi                 XEN=1
-    ipfiremake mISDN                   XEN=1
-    ipfiremake dahdi                   XEN=1 KMOD=1
-    ipfiremake cryptodev                       XEN=1
-    ipfiremake compat-wireless         XEN=1
-    ipfiremake r8169                   XEN=1
-    ipfiremake r8168                   XEN=1
-    ipfiremake r8101                   XEN=1
-    ipfiremake e1000                   XEN=1
-    ipfiremake e1000e                  XEN=1
-    ipfiremake igb                     XEN=1
-    ipfiremake linux                   PAE=1
-    ipfiremake kqemu                   PAE=1
-    ipfiremake kvm-kmod                        PAE=1
-    ipfiremake v4l-dvb                 PAE=1
-    ipfiremake madwifi                 PAE=1
-    ipfiremake alsa                    PAE=1 KMOD=1
-    ipfiremake mISDN                   PAE=1
-    ipfiremake dahdi                   PAE=1 KMOD=1
-    ipfiremake cryptodev                       PAE=1
-    ipfiremake compat-wireless         PAE=1
-#    ipfiremake r8169                  PAE=1
-#    ipfiremake r8168                  PAE=1
-#    ipfiremake r8101                  PAE=1
-    ipfiremake e1000                   PAE=1
-    ipfiremake e1000e                  PAE=1
-    ipfiremake igb                     PAE=1
+    ipfiremake linux                   KCFG="-xen"
+    ipfiremake kqemu                   KCFG="-xen"
+    ipfiremake v4l-dvb                 KCFG="-xen"
+    ipfiremake madwifi                 KCFG="-xen"
+    ipfiremake mISDN                   KCFG="-xen"
+    ipfiremake dahdi                   KCFG="-xen" KMOD=1
+    ipfiremake cryptodev               KCFG="-xen"
+    ipfiremake compat-wireless         KCFG="-xen"
+    ipfiremake r8169                   KCFG="-xen"
+    ipfiremake r8168                   KCFG="-xen"
+    ipfiremake r8101                   KCFG="-xen"
+    ipfiremake e1000                   KCFG="-xen"
+    ipfiremake e1000e                  KCFG="-xen"
+    ipfiremake igb                     KCFG="-xen"
+    ipfiremake linux                   KCFG="-pae"
+    ipfiremake kqemu                   KCFG="-pae"
+    ipfiremake kvm-kmod                        KCFG="-pae"
+    ipfiremake v4l-dvb                 KCFG="-pae"
+    ipfiremake madwifi                 KCFG="-pae"
+    ipfiremake alsa                    KCFG="-pae" KMOD=1
+    ipfiremake mISDN                   KCFG="-pae"
+    ipfiremake dahdi                   KCFG="-pae" KMOD=1
+    ipfiremake cryptodev               KCFG="-pae"
+    ipfiremake compat-wireless         KCFG="-pae"
+#    ipfiremake r8169                  KCFG="-pae"
+#    ipfiremake r8168                  KCFG="-pae"
+#    ipfiremake r8101                  KCFG="-pae"
+    ipfiremake e1000                   KCFG="-pae"
+    ipfiremake e1000e                  KCFG="-pae"
+    ipfiremake igb                     KCFG="-pae"
   fi
 
   # Default kernel build
-  ipfiremake linux
-  ipfiremake v4l-dvb
-  ipfiremake kqemu
-  ipfiremake kvm-kmod
-  ipfiremake madwifi
+  ipfiremake linux                     KCFG=""
+  ipfiremake v4l-dvb                   KCFG=""
+  ipfiremake kqemu                     KCFG=""
+  ipfiremake kvm-kmod                  KCFG=""
+  ipfiremake madwifi                   KCFG=""
   if [ "${MACHINE_TYPE}" != "arm" ]; then
     #todo enable alsa driver in kernel config
-    ipfiremake alsa                    KMOD=1
+    ipfiremake alsa                    KCFG="" KMOD=1
   fi
   #undefined declaration in echo canceler try to fix later
-  ipfiremake mISDN
-  ipfiremake dahdi                     KMOD=1
-  ipfiremake cryptodev
-  ipfiremake compat-wireless
-#  ipfiremake r8169
-#  ipfiremake r8168
-#  ipfiremake r8101
-  ipfiremake e1000
-  ipfiremake e1000e
-  ipfiremake igb
+  ipfiremake mISDN                     KCFG=""
+  ipfiremake dahdi                     KCFG="" KMOD=1
+  ipfiremake cryptodev                 KCFG=""
+  ipfiremake compat-wireless           KCFG=""
+#  ipfiremake r8169                    KCFG=""
+#  ipfiremake r8168                    KCFG=""
+#  ipfiremake r8101                    KCFG=""
+  ipfiremake e1000                     KCFG=""
+  ipfiremake e1000e                    KCFG=""
+  ipfiremake igb                       KCFG=""
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -731,9 +724,9 @@ buildipfire() {
   cat /proc/cpuinfo >> $BASEDIR/build/var/ipfire/firebuild
   echo $PAKFIRE_CORE > $BASEDIR/build/opt/pakfire/db/core/mine
   if [ "$GIT_BRANCH" = "next" ]; then
-       echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
+       echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_LASTCOMMIT" > $BASEDIR/build/etc/system-release
   else
-       echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+       echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
   fi
 }
 
@@ -773,7 +766,9 @@ buildpackages() {
   
   # Update changelog
   cd $BASEDIR
-  $0 git log
+  [ -z $GIT_TAG ]  || LAST_TAG=$GIT_TAG
+  [ -z $LAST_TAG ] || EXT="$LAST_TAG..HEAD"
+  git log -n 500 --no-merges --pretty=medium --shortstat $EXT > $BASEDIR/doc/ChangeLog
 
   # Create images for install
   ipfiremake cdrom