From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sat, 30 Oct 2010 19:37:44 +0000 (+0200)
Subject: Merge commit 'origin/master' into next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=57e682114e87ea9ed4cc419aea17dfd63cf3917b;hp=-c

Merge commit 'origin/master' into next

Conflicts:
	make.sh
---

57e682114e87ea9ed4cc419aea17dfd63cf3917b
diff --combined make.sh
index 577a123e9,03cf93736..15923362a
--- a/make.sh
+++ b/make.sh
@@@ -24,9 -24,9 +24,9 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.7"							# Version number
 +VERSION="2.8test"						# Version number
- CORE="41"							# Core Level (Filename)
- PAKFIRE_CORE="40"						# Core Level (PAKFIRE)
+ 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 +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)
  
  # Debian specific settings
@@@ -358,22 -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
@@@ -393,10 -377,9 +393,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
@@@ -417,7 -400,6 +417,7 @@@
    ipfiremake pcre
    ipfiremake slang
    ipfiremake newt
 +  ipfiremake attr
    ipfiremake libcap
    ipfiremake pciutils
    ipfiremake usbutils
@@@ -436,6 -418,7 +436,6 @@@
    ipfiremake cdrtools
    ipfiremake dnsmasq
    ipfiremake dosfstools
 -  ipfiremake squashfstools
    ipfiremake reiserfsprogs
    ipfiremake xfsprogs
    ipfiremake sysfsutils
@@@ -658,14 -641,12 +658,14 @@@
    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
@@@ -690,10 -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() {
@@@ -701,6 -706,7 +701,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