X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=55684d5742aaa0011feaed6e3e160378f9ddecb1;hp=64cde456d4059e4a859920cf74b2bb96e6755698;hb=534fb55f9d0a212c5d857eb3eccabe5c08df1ba1;hpb=1913c6a86e0d199eb4eec7084ca9c2025a86bfc1

diff --git a/make.sh b/make.sh
index 64cde456d..55684d574 100755
--- 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,93 +372,80 @@ 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 mISDN			KCFG="-xen"
     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 r8169			KCFG="-xen"
+    ipfiremake r8168			KCFG="-xen"
+    ipfiremake r8101			KCFG="-xen"
+    ipfiremake e1000			KCFG="-xen"
+    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 mISDN			KCFG="-pae"
     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"
+    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 mISDN			KCFG=""
     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 r8169			KCFG=""
+    ipfiremake r8168			KCFG=""
+    ipfiremake r8101			KCFG=""
+    ipfiremake e1000e			KCFG=""
+    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"
+    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"
 
+    # arm-omap (Panda Board) kernel build
     ipfiremake linux			KCFG="-omap"
     ipfiremake v4l-dvb			KCFG="-omap"
-#    ipfiremake kvm-kmod			KCFG="-omap"
-#    ipfiremake mISDN			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
+
+    # 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 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 r8169			KCFG="-kirkwood"
+    ipfiremake r8168			KCFG="-kirkwood"
+    ipfiremake r8101			KCFG="-kirkwood"
+    ipfiremake e1000e			KCFG="-kirkwood"
+    ipfiremake igb			KCFG="-kirkwood"
 
   fi
   ipfiremake pkg-config
@@ -532,7 +519,6 @@ buildipfire() {
   ipfiremake mISDNuser
   ipfiremake capi4k-utils
   ipfiremake hwdata
-  ipfiremake kudzu
   ipfiremake logrotate
   ipfiremake logwatch
   ipfiremake misc-progs
@@ -751,7 +737,6 @@ buildipfire() {
   ipfiremake python-progressbar
   ipfiremake python-xattr
   ipfiremake intltool
-  ipfiremake pakfire3-deps
   ipfiremake transmission
   ipfiremake dpfhack
   ipfiremake lcd4linux
@@ -765,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
@@ -774,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() {
@@ -839,6 +828,8 @@ buildpackages() {
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ]) && [ "${MACHINE_TYPE}" != "arm" ]; then
         cp -f $BASEDIR/packages/linux-xen-*.ipfire $LFS/install/packages/
         cp -f $BASEDIR/packages/meta-linux-xen $LFS/install/packages/
+        cp -f $BASEDIR/packages/linux-pae-*.ipfire $LFS/install/packages/
+        cp -f $BASEDIR/packages/meta-linux-pae $LFS/install/packages/
 	ipfiremake xen-image
 	rm -rf $LFS/install/packages/linux-xen-*.ipfire
 	rm -rf $LFS/install/packages/meta-linux-xen
@@ -875,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