X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d09d24cba328d9008d3c50755e49cdf558b3ea7c;hp=d8de79263a0656c86da3f0697805e3355bc92ee9;hb=a19ff965bb6b586d56907cb77bdc0f70b2b3c459;hpb=beebfc233534e60797ae6b9cd8be0ed85c139fb1

diff --git a/make.sh b/make.sh
index d8de79263..d09d24cba 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.13"							# Version number
-CORE="63"							# Core Level (Filename)
-PAKFIRE_CORE="63"						# Core Level (PAKFIRE)
+CORE="69"							# Core Level (Filename)
+PAKFIRE_CORE="68"						# 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
@@ -37,7 +37,7 @@ KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 MACHINE=`uname -m`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=5
+TOOLCHAINVER=6
 
 BUILDMACHINE=$MACHINE
     if [ "$MACHINE" = "x86_64" ]; then
@@ -258,7 +258,7 @@ buildtoolchain() {
     lfsmake1 ccache			PASS=1
     lfsmake1 binutils			PASS=1
     lfsmake1 gcc			PASS=1
-    lfsmake1 linux2			TOOLS=1 HEADERS=1
+    lfsmake1 linux			TOOLS=1 KCFG="-headers"
     lfsmake1 glibc
     lfsmake1 cleanup-toolchain		PASS=1
     lfsmake1 binutils			PASS=2
@@ -294,7 +294,7 @@ buildbase() {
     LOGFILE="$BASEDIR/log/_build.base.log"
     export LOGFILE
     lfsmake2 stage2
-    lfsmake2 linux2			HEADERS=1
+    lfsmake2 linux			KCFG="-headers"
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
@@ -372,17 +372,19 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake linux-firmware
+  ipfiremake dvb-firmwares
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
   ipfiremake u-boot
 
-  # The xen and PAE kernels are only available for x86
   if [ "${MACHINE_TYPE}" != "arm" ]; then
+
+    # x86-xen (Legacy XEN) kernel build
     ipfiremake linux2			KCFG="-xen"
     ipfiremake v4l-dvb			KCFG="-xen"
     ipfiremake mISDN			KCFG="-xen"
     ipfiremake cryptodev		KCFG="-xen"
-    ipfiremake compat-wireless		KCFG="-xen"
+    ipfiremake compat-drivers		KCFG="-xen"
     ipfiremake r8169			KCFG="-xen"
     ipfiremake r8168			KCFG="-xen"
     ipfiremake r8101			KCFG="-xen"
@@ -390,26 +392,26 @@ buildipfire() {
     ipfiremake e1000e			KCFG="-xen"
     ipfiremake igb			KCFG="-xen"
 
+    # 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"
     ipfiremake cryptodev		KCFG="-pae"
-    ipfiremake compat-wireless		KCFG="-pae"
+    ipfiremake compat-drivers		KCFG="-pae"
     ipfiremake r8169			KCFG="-pae"
     ipfiremake r8168			KCFG="-pae"
     ipfiremake r8101			KCFG="-pae"
     ipfiremake e1000e			KCFG="-pae"
     ipfiremake igb			KCFG="-pae"
 
+    # 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=""
     ipfiremake cryptodev		KCFG=""
-    ipfiremake compat-wireless		KCFG=""
+    ipfiremake compat-drivers		KCFG=""
     ipfiremake r8169			KCFG=""
     ipfiremake r8168			KCFG=""
     ipfiremake r8101			KCFG=""
@@ -417,46 +419,31 @@ buildipfire() {
     ipfiremake igb			KCFG=""
 
   else
-    # arm-omap kernel build
+    # arm-rpi (Raspberry Pi) kernel build
     ipfiremake linux			KCFG="-rpi"
     ipfiremake v4l-dvb			KCFG="-rpi"
-#    ipfiremake kvm-kmod			KCFG="-rpi"
     ipfiremake mISDN			KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev		KCFG="-rpi"
-    ipfiremake compat-wireless		KCFG="-rpi"
-#    ipfiremake r8169			KCFG="-rpi"
-#    ipfiremake r8168			KCFG="-rpi"
-#    ipfiremake r8101			KCFG="-rpi"
-#    ipfiremake e1000			KCFG="-rpi"
-#    ipfiremake e1000e			KCFG="-rpi"
-#    ipfiremake igb			KCFG="-rpi"
+    ipfiremake compat-drivers		KCFG="-rpi"
 
+    # arm-omap (Panda Board) kernel build
     ipfiremake linux			KCFG="-omap"
     ipfiremake v4l-dvb			KCFG="-omap"
-#    ipfiremake kvm-kmod			KCFG="-omap"
     ipfiremake mISDN			KCFG="-omap" NOPCI=1
     ipfiremake cryptodev		KCFG="-omap"
-    ipfiremake compat-wireless		KCFG="-omap"
-#    ipfiremake r8169			KCFG="-omap"
-#    ipfiremake r8168			KCFG="-omap"
-#    ipfiremake r8101			KCFG="-omap"
-#    ipfiremake e1000			KCFG="-omap"
-#    ipfiremake e1000e			KCFG="-omap"
-#    ipfiremake igb			KCFG="-omap"
-
-    # arm-kirkwood kernel build
+    ipfiremake compat-drivers		KCFG="-omap"
+
+    # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux			KCFG="-kirkwood"
     ipfiremake v4l-dvb			KCFG="-kirkwood"
-#    ipfiremake kvm-kmod			KCFG="-kirkwood"
     ipfiremake mISDN			KCFG="-kirkwood"
     ipfiremake cryptodev		KCFG="-kirkwood"
-    ipfiremake compat-wireless		KCFG="-kirkwood"
-#    ipfiremake r8169			KCFG="-kirkwood"
-#    ipfiremake r8168			KCFG="-kirkwood"
-#    ipfiremake r8101			KCFG="-kirkwood"
-#    ipfiremake e1000			KCFG="-kirkwood"
-#    ipfiremake e1000e			KCFG="-kirkwood"
-#    ipfiremake igb			KCFG="-kirkwood"
+    ipfiremake compat-drivers		KCFG="-kirkwood"
+    ipfiremake r8169			KCFG="-kirkwood"
+    ipfiremake r8168			KCFG="-kirkwood"
+    ipfiremake r8101			KCFG="-kirkwood"
+    ipfiremake e1000e			KCFG="-kirkwood"
+    ipfiremake igb			KCFG="-kirkwood"
 
   fi
   ipfiremake pkg-config
@@ -522,7 +509,9 @@ buildipfire() {
   ipfiremake mtools
   ipfiremake initscripts
   ipfiremake whatmask
+  ipfiremake libmnl
   ipfiremake iptables
+  ipfiremake conntrack-tools
   ipfiremake libupnp
   ipfiremake ipaddr
   ipfiremake iputils
@@ -530,7 +519,6 @@ buildipfire() {
   ipfiremake mISDNuser
   ipfiremake capi4k-utils
   ipfiremake hwdata
-  ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
@@ -548,6 +536,7 @@ buildipfire() {
   ipfiremake Net-IPv4Addr
   ipfiremake Net_SSLeay
   ipfiremake IO-Stringy
+  ipfiremake IO-Socket-SSL
   ipfiremake Unix-Syslog
   ipfiremake Mail-Tools
   ipfiremake MIME-Tools
@@ -602,6 +591,7 @@ buildipfire() {
   ipfiremake ghostscript
   ipfiremake foomatic
   ipfiremake hplip
+  ipfiremake cifs-utils
   ipfiremake samba
   ipfiremake sudo
   ipfiremake mc
@@ -636,7 +626,6 @@ buildipfire() {
   ipfiremake libsigc++
   ipfiremake libtorrent
   ipfiremake rtorrent
-  ipfiremake ipfireseeder
   ipfiremake rsync
   ipfiremake tcpwrapper
   ipfiremake libevent
@@ -674,8 +663,10 @@ buildipfire() {
   ipfiremake dfb++
   ipfiremake faad2
   ipfiremake ffmpeg
-  ipfiremake videolan
   ipfiremake vdr
+  ipfiremake vdr_streamdev
+  ipfiremake vdr_vnsiserver3
+  ipfiremake vdr_epgsearch
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
@@ -709,6 +700,7 @@ buildipfire() {
   ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
+  ipfiremake perl-Sort-Naturally
   ipfiremake vdradmin
   ipfiremake miau
   ipfiremake netsnmpd
@@ -749,7 +741,6 @@ buildipfire() {
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
-  ipfiremake pakfire3-deps
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
@@ -763,6 +754,20 @@ buildipfire() {
   ipfiremake libassuan
   ipfiremake gpgme
   ipfiremake pygpgme
+  ipfiremake pakfire3
+  ipfiremake stress
+  ipfiremake libstatgrab
+  ipfiremake sarg
+  ipfiremake fstrim
+  ipfiremake check_mk_agent
+  ipfiremake libdaemon
+  ipfiremake avahi
+  ipfiremake nginx
+  ipfiremake sendEmail
+  ipfiremake sysbench
+  ipfiremake strace
+  ipfiremake ipfire-netboot
+  ipfiremake lcdproc
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -772,11 +777,19 @@ 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
+  if [ "$(git status -s | wc -l)" == "0" ]; then
+	GIT_STATUS=""
   else
-	echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
+	GIT_STATUS="-dirty"
   fi
+  case "$GIT_BRANCH" in
+	core*|beta?|rc?)
+	    echo "$NAME $VERSION ($MACHINE) - $GIT_BRANCH$GIT_STATUS" > $BASEDIR/build/etc/system-release
+	    ;;
+	*)
+	    echo "$NAME $VERSION ($MACHINE) - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" > $BASEDIR/build/etc/system-release
+	    ;;
+  esac
 }
 
 buildinstaller() {
@@ -875,7 +888,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