From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 Aug 2012 10:12:20 +0000 (+0200)
Subject: Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc... 
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f5bbd27c5c2d3fc067a15fab26fc21b443453cbe;hp=-c

Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc-update2
---

f5bbd27c5c2d3fc067a15fab26fc21b443453cbe
diff --combined make.sh
index 92ad93006,6fd78d998..a531e4b74
--- a/make.sh
+++ b/make.sh
@@@ -222,7 -222,7 +222,7 @@@ prepareenv() 
      # Run LFS static binary creation scripts one by one
      export CCACHE_DIR=$BASEDIR/ccache
      export CCACHE_COMPRESS=1
 -    export CCACHE_HASHDIR=1
 +    export CCACHE_COMPILERCHECK="none"
  
      # Remove pre-install list of installed files in case user erase some files before rebuild
      rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@@ -428,8 -428,32 +428,32 @@@ buildipfire() 
    else
      # arm-omap kernel build
      ipfiremake linux			KCFG="-rpi"
+ #    ipfiremake v4l-dvb			KCFG="-rpi"
+ #    ipfiremake kvm-kmod			KCFG="-rpi"
+ #    ipfiremake mISDN			KCFG="-rpi"
+ #    ipfiremake dahdi			KCFG="-rpi" KMOD=1
+     ipfiremake cryptodev		KCFG="-rpi"
+ #    ipfiremake compat-wireless		KCFG="-rpi"
+ #    ipfiremake r8169			KCFG="-rpi"
+ #    ipfiremake r8168			KCFG="-rpi"
+ #    ipfiremake r8101			KCFG="-rpi"
+ #    ipfiremake e1000			KCFG="-rpi"
+ #    ipfiremake e1000e			KCFG="-rpi"
+ #    ipfiremake igb			KCFG="-rpi"
  
      ipfiremake linux			KCFG="-omap"
+ #    ipfiremake v4l-dvb			KCFG="-omap"
+ #    ipfiremake kvm-kmod			KCFG="-omap"
+ #    ipfiremake mISDN			KCFG="-omap"
+ #    ipfiremake dahdi			KCFG="-omap" KMOD=1
+     ipfiremake cryptodev		KCFG="-omap"
+ #    ipfiremake compat-wireless		KCFG="-omap"
+ #    ipfiremake r8169			KCFG="-omap"
+ #    ipfiremake r8168			KCFG="-omap"
+ #    ipfiremake r8101			KCFG="-omap"
+ #    ipfiremake e1000			KCFG="-omap"
+ #    ipfiremake e1000e			KCFG="-omap"
+ #    ipfiremake igb			KCFG="-omap"
  
      # arm-versatile kernel build
      ipfiremake linux			KCFG="-versatile"
@@@ -589,6 -613,7 +613,6 @@@
    ipfiremake traceroute
    ipfiremake vlan
    ipfiremake wireless
 -  ipfiremake libsafe
    ipfiremake pakfire
    ipfiremake spandsp
    ipfiremake lzo
@@@ -604,6 -629,7 +628,6 @@@
    ipfiremake wget
    ipfiremake bridge-utils
    ipfiremake screen
 -  ipfiremake hddtemp
    ipfiremake smartmontools
    ipfiremake htop
  #  ipfiremake postfix               # unknown system type linux 3.2.x