From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 27 Nov 2010 00:18:29 +0000 (+0100)
Subject: Merge commit 'origin/next'
X-Git-Tag: v2.9-beta1~48^2~5^2~2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=504d0a27d2dca40436d2807cea78bb908b8fa68b;hp=-c

Merge commit 'origin/next'

Conflicts:
	make.sh
---

504d0a27d2dca40436d2807cea78bb908b8fa68b
diff --combined make.sh
index fc3d938778,24753ce9ce..d9abd2a474
--- a/make.sh
+++ b/make.sh
@@@ -24,7 -24,7 +24,7 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
- VERSION="2.7"							# Version number
+ VERSION="2.8test"						# Version number
  CORE="43"							# Core Level (Filename)
  PAKFIRE_CORE="42"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  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)
  
  BUILDMACHINE=$MACHINE
@@@ -234,9 -234,12 +234,12 @@@ prepareenv() 
  }
  
  buildtoolchain() {
-     if [ "$MACHINE" = "x86_64" ]; then
+     if [ "$(uname -m)" = "x86_64" ]; then
          exiterror "Cannot build toolchain on x86_64. Please use the download."
      fi
+     if [ "$(uname -r | grep ipfire)" ]; then
+         exiterror "Cannot build toolchain on ipfire. Please use the download."
+     fi
  
      LOGFILE="$BASEDIR/log/_build.toolchain.log"
      export LOGFILE
@@@ -324,7 -327,6 +327,6 @@@ buildbase() 
      lfsmake2 man
      lfsmake2 mktemp
      lfsmake2 module-init-tools
-     lfsmake2 mtd
      lfsmake2 net-tools
      lfsmake2 patch
      lfsmake2 psmisc
@@@ -369,6 -371,22 +371,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
@@@ -388,9 -406,10 +406,10 @@@
    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
@@@ -411,6 -430,7 +430,7 @@@
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
+   ipfiremake attr
    ipfiremake libcap
    ipfiremake pciutils
    ipfiremake usbutils
@@@ -429,7 -449,6 +449,6 @@@
    ipfiremake cdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
-   ipfiremake squashfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
    ipfiremake sysfsutils
@@@ -652,13 -671,16 +671,16 @@@
    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
+   ipfiremake client175
    echo Build on $HOSTNAME > $BASEDIR/build/var/ipfire/firebuild
    cat /proc/version >> $BASEDIR/build/var/ipfire/firebuild
    echo >> $BASEDIR/build/var/ipfire/firebuild
@@@ -668,7 -690,7 +690,7 @@@
    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" = "next" ]; then
 +  if [ "$GIT_BRANCH" = "master" ]; then
  	echo "$NAME $VERSION - (Development Build: $GIT_LASTCOMMIT)" > $BASEDIR/build/etc/system-release
    else
  	echo "$NAME $VERSION - $GIT_BRANCH" > $BASEDIR/build/etc/system-release
@@@ -682,34 -704,10 +704,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() {
@@@ -717,7 -715,6 +715,6 @@@
    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