From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Dec 2010 17:27:26 +0000 (+0100)
Subject: Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
X-Git-Tag: v2.9-beta2~18^2~1^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=11b2b92bab2282d7c6c8dec0fbcb3f600fabe83a;hp=-c;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'master' of ssh://git.ipfire.org/srv/git/ipfire-2.x
---

11b2b92bab2282d7c6c8dec0fbcb3f600fabe83a
diff --combined config/rootfiles/core/44/update.sh
index eeb68f01bb,82daecea7a..24103f9f80
--- a/config/rootfiles/core/44/update.sh
+++ b/config/rootfiles/core/44/update.sh
@@@ -24,7 -24,7 +24,7 @@@
  . /opt/pakfire/lib/functions.sh
  /usr/local/bin/backupctrl exclude >/dev/null 2>&1
  #
- KVER="2.6.32.26"
+ KVER="2.6.32.27"
  MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
  # Nur den letzten Parameter verwenden
  echo $MOUNT > /dev/null
@@@ -101,12 -101,6 +101,12 @@@ echo Unpack the updated files ..
  tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
  	--no-overwrite-dir
  
 +# Re-read crontab
 +fcrontab -z
 +
 +# Remove old pakfire cronjob.
 +rm -f /etc/fcron.daily/pakfire-update
 +
  # Convert /etc/fstab entries to UUID ...
  #
  echo Convert fstab entries to UUID ...
diff --combined lfs/linux
index 9b7d93e11a,c1179faa9c..85d0a09d68
--- a/lfs/linux
+++ b/lfs/linux
@@@ -24,8 -24,8 +24,8 @@@
  
  include Config
  
- PATCHLEVEL = .26
- VER        = 2.6.32.26
+ PATCHLEVEL = .27
+ VER        = 2.6.32.27
  
  THISAPP    = linux-$(VER)
  DL_FILE    = $(THISAPP).tar.bz2
@@@ -35,7 -35,7 +35,7 @@@ CFLAGS     
  CXXFLAGS   =
  
  PROG	   = linux-xen
- PAK_VER    = 12
+ PAK_VER    = 13
  DEPS	   = ""
  
  # Normal build or XEN build.
@@@ -68,7 -68,7 +68,7 @@@ patch-2.6.16-nath323-1.3.bz2		= $(URL_I
  reiser4-for-2.6.32.patch.bz2		= $(URL_IPFIRE)/reiser4-for-2.6.32.patch.bz2
  xen-patches-2.6.32-2d.tar.bz2		= $(URL_IPFIRE)/xen-patches-2.6.32-2d.tar.bz2
  
- $(DL_FILE)_MD5				= bdb37b8e48aaf33d9bd6e2af3ae2f1ea
+ $(DL_FILE)_MD5				= c8df8bed01a3b7e4ce13563e74181d71
  netfilter-layer7-v2.22.tar.gz_MD5	= 98dff8a3d5a31885b73341633f69501f
  patch-2.6.16-nath323-1.3.bz2_MD5	= f926409ff703a307baf54b57ab75d138
  reiser4-for-2.6.32.patch.bz2_MD5	= 3246397973d9271eb8e6d7c97c5d2d91
@@@ -145,10 -145,6 +145,10 @@@ endi
  	# Huawei Android Phones (Vodafone V845, T-Mobile Pulse/mini ...)
  	cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-2.6.32.15-option_add_huawei_android.patch
  
 +	# Install ipfire logo
 +	cd $(DIR_APP) && cp -vf $(DIR_SRC)/config/kernel/ipfire_logo.ppm \
 +		drivers/video/logo/logo_linux_clut224.ppm
 +
  	# Cleanup kernel source
  
  	cp $(DIR_SRC)/config/kernel/kernel.config.$(MACHINE)-$(VERSUFIX) $(DIR_APP)/.config