X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=15923362ad14d1fb3a62139b68f4b7cffaedbe27;hp=03cf937360d1cd0ba628a6601736321d0c497f92;hb=57e682114e87ea9ed4cc419aea17dfd63cf3917b;hpb=4b8ede3119e17390a0ca799f39ef31d6bdfb1905

diff --git a/make.sh b/make.sh
index 03cf937360..15923362ad 100755
--- a/make.sh
+++ b/make.sh
@@ -24,7 +24,7 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.7"							# Version number
+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
@@ -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=3
+TOOLCHAINVER=1
 IPFVER="full"				# Which versions should be compiled? (full|devel)
 
 # Debian specific settings
@@ -358,6 +358,22 @@ buildipfire() {
   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
@@ -377,9 +393,10 @@ buildipfire() {
   ipfiremake pkg-config
   ipfiremake linux-atm
   ipfiremake cpio
-  ipfiremake klibc
-  ipfiremake mkinitcpio
-  ipfiremake udev			KLIBC=1
+
+  installmake strip
+
+  ipfiremake dracut
   ipfiremake expat
   ipfiremake gdbm
   ipfiremake gmp
@@ -400,6 +417,7 @@ buildipfire() {
   ipfiremake pcre
   ipfiremake slang
   ipfiremake newt
+  ipfiremake attr
   ipfiremake libcap
   ipfiremake pciutils
   ipfiremake usbutils
@@ -418,7 +436,6 @@ buildipfire() {
   ipfiremake cdrtools
   ipfiremake dnsmasq
   ipfiremake dosfstools
-  ipfiremake squashfstools
   ipfiremake reiserfsprogs
   ipfiremake xfsprogs
   ipfiremake sysfsutils
@@ -641,12 +658,14 @@ 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
@@ -671,34 +690,10 @@ 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
-  installmake 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
-  installmake installer
-  installmake initrd
+  ipfiremake installer
+  cp -f $BASEDIR/doc/COPYING $BASEDIR/build/install/initrd/
+  installmake strip
+  ipfiremake initrd
 }
 
 buildpackages() {
@@ -706,7 +701,6 @@ buildpackages() {
   export LOGFILE
   echo "... see detailed log in _build.*.log files" >> $LOGFILE
 
-  installmake strip
   
   # Generating list of packages used
   echo -n "Generating packages list from logs" | tee -a $LOGFILE