From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Sun, 5 Sep 2010 12:32:42 +0000 (+0200)
Subject: Merge branch 'master' into next
X-Git-Tag: v2.9-beta1~48^2~5^2~2^2~94
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=d7534b193e43ef5de7602b5dc7070f8ab4212554

Merge branch 'master' into next

Conflicts:
	config/rootfiles/core/40/exclude
	config/rootfiles/core/40/filelists/files
	config/rootfiles/core/40/update.sh
	make.sh
---

d7534b193e43ef5de7602b5dc7070f8ab4212554
diff --cc make.sh
index 4d4529ff44,166f9ecab4..732a06f299
--- a/make.sh
+++ b/make.sh
@@@ -24,8 -24,8 +24,8 @@@
  
  NAME="IPFire"							# Software name
  SNAME="ipfire"							# Short name
 -VERSION="2.7"							# Version number
 +VERSION="2.8test"						# Version number
- CORE="40"							# Core Level (Filename)
+ CORE="41"							# Core Level (Filename)
  PAKFIRE_CORE="40"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
@@@ -355,9 -355,10 +355,10 @@@ buildipfire() 
    ipfiremake r8101			XEN=1
    ipfiremake e1000			XEN=1
    ipfiremake e1000e			XEN=1
+   ipfiremake igb			XEN=1
    ipfiremake linux
    ipfiremake kqemu
 -  ipfiremake kvm-kmod
 +#  ipfiremake kvm-kmod
    ipfiremake v4l-dvb
    ipfiremake madwifi
    ipfiremake alsa			KMOD=1