X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=0dfe0ec89b50c945ba965b6faf2f1db226971614;hp=7fcb69f9357030b3d438f6ea290742ca4ab9a9a2;hb=f2ce8e838fc8dbaeede744d8704240e3ab02036c;hpb=52a2f02f41d362b84d294a0b3239d93cd2010a14

diff --git a/make.sh b/make.sh
index 7fcb69f93..0dfe0ec89 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="72"							# Core Level (Filename)
-PAKFIRE_CORE="71"						# Core Level (PAKFIRE)
+CORE="73"							# Core Level (Filename)
+PAKFIRE_CORE="72"						# 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
@@ -356,6 +356,7 @@ buildbase() {
     lfsmake2 util-linux
     lfsmake2 vim
     lfsmake2 xz
+    lfsmake2 paxctl
     lfsmake2 grub
 }
 
@@ -377,7 +378,9 @@ buildipfire() {
   ipfiremake dvb-firmwares
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
+  ipfiremake bc
   ipfiremake u-boot
+  ipfiremake u-boot-panda
 
   if [ "${MACHINE_TYPE}" != "arm" ]; then
 
@@ -396,56 +399,56 @@ buildipfire() {
 
     # x86-pae (Native and new XEN) kernel build
     ipfiremake linux			KCFG="-pae"
-    ipfiremake kvm-kmod			KCFG="-pae"
-    ipfiremake v4l-dvb			KCFG="-pae"
-    ipfiremake mISDN			KCFG="-pae"
+#    ipfiremake kvm-kmod			KCFG="-pae"
+#    ipfiremake v4l-dvb			KCFG="-pae"
+#    ipfiremake mISDN			KCFG="-pae"
     ipfiremake cryptodev		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"
+#    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 v4l-dvb			KCFG=""
-    ipfiremake mISDN			KCFG=""
+#    ipfiremake kvm-kmod			KCFG=""
+#    ipfiremake v4l-dvb			KCFG=""
+#    ipfiremake mISDN			KCFG=""
     ipfiremake cryptodev		KCFG=""
-    ipfiremake compat-drivers		KCFG=""
-    ipfiremake r8169			KCFG=""
-    ipfiremake r8168			KCFG=""
-    ipfiremake r8101			KCFG=""
-    ipfiremake e1000e			KCFG=""
-    ipfiremake igb			KCFG=""
+#    ipfiremake compat-drivers		KCFG=""
+#    ipfiremake r8169			KCFG=""
+#    ipfiremake r8168			KCFG=""
+#    ipfiremake r8101			KCFG=""
+#    ipfiremake e1000e			KCFG=""
+#    ipfiremake igb			KCFG=""
 
   else
     # arm-rpi (Raspberry Pi) kernel build
     ipfiremake linux			KCFG="-rpi"
-    ipfiremake v4l-dvb			KCFG="-rpi"
-    ipfiremake mISDN			KCFG="-rpi" NOPCI=1
+#    ipfiremake v4l-dvb			KCFG="-rpi"
+#    ipfiremake mISDN			KCFG="-rpi" NOPCI=1
     ipfiremake cryptodev		KCFG="-rpi"
-    ipfiremake compat-drivers		KCFG="-rpi"
+#    ipfiremake compat-drivers		KCFG="-rpi"
 
     # arm-omap (Panda Board) kernel build
-    ipfiremake linux			KCFG="-omap"
-    ipfiremake v4l-dvb			KCFG="-omap"
-    ipfiremake mISDN			KCFG="-omap" NOPCI=1
-    ipfiremake cryptodev		KCFG="-omap"
-    ipfiremake compat-drivers		KCFG="-omap"
+#    ipfiremake linux			KCFG="-omap"
+#    ipfiremake v4l-dvb			KCFG="-omap"
+#    ipfiremake mISDN			KCFG="-omap" NOPCI=1
+#    ipfiremake cryptodev		KCFG="-omap"
+#    ipfiremake compat-drivers		KCFG="-omap"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux			KCFG="-kirkwood"
-    ipfiremake v4l-dvb			KCFG="-kirkwood"
-    ipfiremake mISDN			KCFG="-kirkwood"
+#    ipfiremake v4l-dvb			KCFG="-kirkwood"
+#    ipfiremake mISDN			KCFG="-kirkwood"
     ipfiremake cryptodev		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"
+#    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
@@ -529,6 +532,7 @@ buildipfire() {
   ipfiremake URI
   ipfiremake HTML-Tagset
   ipfiremake HTML-Parser
+  ipfiremake HTML-Template
   ipfiremake Compress-Zlib
   ipfiremake Digest
   ipfiremake Digest-SHA1
@@ -677,7 +681,6 @@ buildipfire() {
   ipfiremake mpc
   ipfiremake git
   ipfiremake squidclamav
-  ipfiremake bc
   ipfiremake vnstat
   ipfiremake vnstati
   ipfiremake iw
@@ -752,6 +755,7 @@ buildipfire() {
   ipfiremake acpid
   ipfiremake fping
   ipfiremake telnet
+  ipfiremake xinetd
   ipfiremake libgpg-error
   ipfiremake libassuan
   ipfiremake gpgme
@@ -782,6 +786,8 @@ buildipfire() {
   ipfiremake swatch
   ipfiremake tor
   ipfiremake arm
+  ipfiremake wavemon
+  ipfiremake iptraf-ng
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild