X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=c9c5a71be70f31bcd170c118a46f56d0ce9c7a5a;hp=61308921c8e88cc78bc30517f7470b9fd7b787a6;hb=5a09c99a89fdeed47e0fa9ea0b3623b08422ca26;hpb=f99356520c523e101d4010be6cd3d07f4cb34cbf

diff --git a/make.sh b/make.sh
index 61308921c..c9c5a71be 100755
--- a/make.sh
+++ b/make.sh
@@ -17,17 +17,17 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2013 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2014 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.13"							# Version number
-CORE="73"							# Core Level (Filename)
-PAKFIRE_CORE="73"						# Core Level (PAKFIRE)
-GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
+VERSION="2.15"							# Version number
+CORE="76-beta2"							# Core Level (Filename)
+PAKFIRE_CORE="76"						# Core Level (PAKFIRE)
+GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
@@ -360,7 +360,7 @@ buildbase() {
     lfsmake2 make
     lfsmake2 man
     lfsmake2 mktemp
-    lfsmake2 module-init-tools
+    lfsmake2 kmod
     lfsmake2 net-tools
     lfsmake2 patch
     lfsmake2 psmisc
@@ -369,8 +369,8 @@ buildbase() {
     lfsmake2 sysvinit
     lfsmake2 tar
     lfsmake2 texinfo
-    lfsmake2 udev
     lfsmake2 util-linux
+    lfsmake2 udev
     lfsmake2 vim
     lfsmake2 xz
     lfsmake2 paxctl
@@ -386,6 +386,7 @@ buildipfire() {
   ipfiremake dhcp
   ipfiremake dhcpcd
   ipfiremake libusb
+  ipfiremake libusbx
   ipfiremake libpcap
   ipfiremake ppp
   ipfiremake pptp
@@ -410,8 +411,8 @@ buildipfire() {
 #    ipfiremake r8169			KCFG="-pae"
 #    ipfiremake r8168			KCFG="-pae"
 #    ipfiremake r8101			KCFG="-pae"
-#    ipfiremake e1000e			KCFG="-pae"
-#    ipfiremake igb			KCFG="-pae"
+    ipfiremake e1000e			KCFG="-pae"
+    ipfiremake igb			KCFG="-pae"
 
     # x86 kernel build
     ipfiremake linux			KCFG=""
@@ -423,8 +424,8 @@ buildipfire() {
 #    ipfiremake r8169			KCFG=""
 #    ipfiremake r8168			KCFG=""
 #    ipfiremake r8101			KCFG=""
-#    ipfiremake e1000e			KCFG=""
-#    ipfiremake igb			KCFG=""
+    ipfiremake e1000e			KCFG=""
+    ipfiremake igb			KCFG=""
 
   else
     # arm-rpi (Raspberry Pi) kernel build
@@ -437,6 +438,8 @@ buildipfire() {
     # arm multi platform (Panda, Wandboard ...) kernel build
     ipfiremake linux			KCFG="-multi"
     ipfiremake cryptodev		KCFG="-multi"
+    ipfiremake e1000e			KCFG="-multi"
+    ipfiremake igb			KCFG="-multi"
 
     # arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
     ipfiremake linux			KCFG="-kirkwood"
@@ -447,8 +450,8 @@ buildipfire() {
 #    ipfiremake r8169			KCFG="-kirkwood"
 #    ipfiremake r8168			KCFG="-kirkwood"
 #    ipfiremake r8101			KCFG="-kirkwood"
-#   ipfiremake e1000e			KCFG="-kirkwood"
-#    ipfiremake igb			KCFG="-kirkwood"
+#    ipfiremake e1000e			KCFG="-kirkwood"
+    ipfiremake igb			KCFG="-kirkwood"
 
   fi
   ipfiremake pkg-config
@@ -459,6 +462,7 @@ buildipfire() {
   ipfiremake gdbm
   ipfiremake pam
   ipfiremake openssl
+  ipfiremake openssl-compat
   ipfiremake curl
   ipfiremake tcl
   ipfiremake sqlite
@@ -594,6 +598,8 @@ buildipfire() {
   ipfiremake lzo
   ipfiremake openvpn
   ipfiremake pammysql
+  ipfiremake mpage
+  ipfiremake dbus
   ipfiremake cups
   ipfiremake ghostscript
   ipfiremake foomatic
@@ -647,6 +653,7 @@ buildipfire() {
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake strongswan
+  ipfiremake rng-tools
   ipfiremake lsof
   ipfiremake br2684ctl
   ipfiremake pcmciautils
@@ -674,6 +681,8 @@ buildipfire() {
   ipfiremake vdr_streamdev
   ipfiremake vdr_vnsiserver3
   ipfiremake vdr_epgsearch
+  ipfiremake vdr_dvbapi
+  ipfiremake vdr_eepg
   ipfiremake w_scan
   ipfiremake icecast
   ipfiremake icegenerator
@@ -692,7 +701,6 @@ buildipfire() {
   ipfiremake syslinux
   ipfiremake tftpd
   ipfiremake cpufrequtils
-  ipfiremake dbus
   ipfiremake bluetooth
   ipfiremake gutenprint
   ipfiremake apcupsd
@@ -712,6 +720,8 @@ buildipfire() {
   ipfiremake netsnmpd
   ipfiremake perl-DBI
   ipfiremake perl-DBD-mysql
+  ipfiremake perl-DBD-SQLite
+  ipfiremake perl-File-ReadBackwards
   ipfiremake cacti
   ipfiremake icecc
   ipfiremake openvmtools
@@ -728,7 +738,6 @@ buildipfire() {
   ipfiremake usb_modeswitch_data
   ipfiremake zerofree
   ipfiremake mdadm
-  ipfiremake eject
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
@@ -765,7 +774,6 @@ buildipfire() {
   ipfiremake stress
   ipfiremake libstatgrab
   ipfiremake sarg
-  ipfiremake fstrim
   ipfiremake check_mk_agent
   ipfiremake libdaemon
   ipfiremake avahi
@@ -1082,11 +1090,11 @@ uploadsrc)
 	fi
 
 	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-	REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
 
-	cd $BASEDIR/cache/
-	for file in $(ls -1 --ignore=toolchains); do
-		grep -q "$file" <<<$REMOTE_FILES && continue
+	for file in ${BASEDIR}/cache/*; do
+		[ -d "${file}" ] && continue
+		grep -q "$(basename ${file})" <<<$REMOTE_FILES && continue
 		NEW_FILES="$NEW_FILES $file"
 	done
 	[ -n "$NEW_FILES" ] && scp -2 $NEW_FILES ${IPFIRE_USER}@${URL_SOURCE}