Merge branch 'master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Sun, 5 Sep 2010 12:32:42 +0000 (14:32 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Sun, 5 Sep 2010 12:32:42 +0000 (14:32 +0200)
Conflicts:
config/rootfiles/core/40/exclude
config/rootfiles/core/40/filelists/files
config/rootfiles/core/40/update.sh
make.sh

1  2 
doc/packages-list.txt
make.sh

Simple merge
diff --cc 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