X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=15923362ad14d1fb3a62139b68f4b7cffaedbe27;hp=15f569ba7fee4455d0d7763e3f346d06927428af;hb=c8d680dc8df1b2f7138ae3a8745fd021b0f7ae42;hpb=99555458ad1defb46fa59fb7a7f7ce52001d0ff4

diff --git a/make.sh b/make.sh
index 15f569ba7f..15923362ad 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.7"							# Version number
-CORE="40"							# Core Level (Filename)
-PAKFIRE_CORE="39"						# Core Level (PAKFIRE)
+VERSION="2.8test"						# Version number
+CORE="42"							# Core Level (Filename)
+PAKFIRE_CORE="41"						# 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=2
+TOOLCHAINVER=1
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
 # Debian specific settings
@@ -219,6 +219,7 @@ prepareenv() {
 
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
+    export CCACHE_COMPRESS=1
     export CCACHE_HASHDIR=1
 
     # Remove pre-install list of installed files in case user erase some files before rebuild
@@ -231,7 +232,7 @@ buildtoolchain() {
     ORG_PATH=$PATH
     NATIVEGCC=`gcc --version | grep GCC | awk {'print $3'}`
     export NATIVEGCC GCCmajor=${NATIVEGCC:0:1} GCCminor=${NATIVEGCC:2:1} GCCrelease=${NATIVEGCC:4:1}
-    lfsmake1 ccache
+    lfsmake1 ccache	PASS=1
     lfsmake1 binutils	PASS=1
     lfsmake1 gcc		PASS=1
     export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
@@ -243,6 +244,7 @@ buildtoolchain() {
     lfsmake1 dejagnu
     lfsmake1 gcc		PASS=2
     lfsmake1 binutils	PASS=2
+    lfsmake1 ccache	PASS=2
     lfsmake1 ncurses
     lfsmake1 bash
     lfsmake1 bzip2
@@ -342,22 +344,39 @@ buildipfire() {
   ipfiremake which
   ipfiremake xz
   ipfiremake linux-firmware
-#  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 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
   ipfiremake kqemu
-#  ipfiremake kvm-kmod
+  ipfiremake kvm-kmod
   ipfiremake v4l-dvb
   ipfiremake madwifi
   ipfiremake alsa			KMOD=1
@@ -370,6 +389,7 @@ buildipfire() {
   ipfiremake r8101
   ipfiremake e1000
   ipfiremake e1000e
+  ipfiremake igb
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
@@ -397,6 +417,7 @@ buildipfire() {
   ipfiremake pcre
   ipfiremake slang
   ipfiremake newt
+  ipfiremake attr
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -415,7 +436,6 @@ buildipfire() {
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
-  ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
   ipfiremake sysfsutils
@@ -638,12 +658,15 @@ buildipfire() {
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch
+  ipfiremake usb_modeswitch_data
   ipfiremake zerofree
   ipfiremake mdadm
   ipfiremake eject
   ipfiremake pound
   ipfiremake minicom
   ipfiremake ddrescue
+  ipfiremake tcl
+  ipfiremake imspector
   echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
   cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
   echo >> $BASEDIR/build/var/ipfire/firebuild
@@ -667,33 +690,8 @@ buildinstaller() {
   ipfiremake as86
   ipfiremake mbr
   ipfiremake memtest
-#  installmake linux-libc-header
-#  installmake binutils
-#  ipfiremake uClibc			PASS=1
-#  ipfiremake gcc			INST=1
-#  installmake uClibc			PASS=2
-#  installmake gcc			INST=2
-#  installmake uClibc			PASS=3
-#  ipfiremake busybox
-#  installmake udev
-#  installmake slang
-#  installmake newt
-#  installmake gettext
-#  installmake kbd
-#  installmake popt
-#  installmake sysvinit
-#  installmake misc-progs
-#  installmake reiserfsprogs
-#  installmake sysfsutils
-#  installmake util-linux
-#  installmake pciutils
-#  installmake zlib
-#  installmake mtd
-#  installmake wget
-#  installmake hwdata
-#  installmake kudzu
-#  installmake pcmciautils
   ipfiremake installer
+  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
   installmake strip
   ipfiremake initrd
 }
@@ -1018,11 +1016,12 @@ uploadsrc)
 		beautify message FAIL
 		exit 1
 	fi
+
 	URL_SOURCE=$(grep URL_SOURCE lfs/Config | awk '{ print $3 }')
-	REMOTE_FILES=$(echo "ls -1" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
+	REMOTE_FILES=$(echo "ls -1 --ignore=toolchains" | sftp -C ${IPFIRE_USER}@${URL_SOURCE})
 
 	cd $BASEDIR/cache/
-	for file in $(ls -1); do
+	for file in $(ls -1 --ignore=toolchains); do
 		grep -q "$file" <<<$REMOTE_FILES && continue
 		NEW_FILES="$NEW_FILES $file"
 	done