From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 4 Apr 2009 18:58:03 +0000 (+0200)
Subject: Patch aufs2 to kernel.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd50da4f48828c2676c0e54cada60b0747f3c534;p=ipfire-3.x.git

Patch aufs2 to kernel.
---

diff --git a/config/kernel/kernel.config b/config/kernel/kernel.config
index 58ddcbb2a..328901cb4 100644
--- a/config/kernel/kernel.config
+++ b/config/kernel/kernel.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.29.1
-# Sat Apr  4 13:21:12 2009
+# Sat Apr  4 18:34:55 2009
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -2845,6 +2845,15 @@ CONFIG_SQUASHFS_FRAGMENT_CACHE_SIZE=3
 # CONFIG_ROMFS_FS is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+CONFIG_AUFS_FS=m
+CONFIG_AUFS_BRANCH_MAX_127=y
+# CONFIG_AUFS_BRANCH_MAX_511 is not set
+# CONFIG_AUFS_BRANCH_MAX_1023 is not set
+# CONFIG_AUFS_BRANCH_MAX_32767 is not set
+# CONFIG_AUFS_HINOTIFY is not set
+CONFIG_AUFS_EXPORT=y
+# CONFIG_AUFS_DEBUG is not set
+CONFIG_AUFS_BDEV_LOOP=y
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=m
 CONFIG_NFS_V3=y
diff --git a/lfs/linux b/lfs/linux
index b25e08c1d..7e9488021 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -58,6 +58,7 @@ LOCALVERSION = -ipfire1
 FULLVER= $(PKG_VER)$(LOCALVERSION)
 
 # Patches
+AUFS_PATCH     = aufs2-$(PKG_VER)-1.patch
 GRSEC_PATCH    = grsecurity-2.1.14-$(PKG_VER)-200903281534.patch
 #OCF_PATCH      = ocf-linux-26-20080917.patch
 REISER4_PATCH  = reiser4-for-$(PKG_VER).patch
@@ -97,6 +98,10 @@ $(OBJECT): $(objects)
 
 	cd $(DIR_APP) && echo "$(LOCALVERSION)" > localversion-ipfire
 
+	### Aufs2
+	#
+	cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(AUFS_PATCH)
+
 	### OCF
 	#
 	#cd $(DIR_APP) && patch -Np1 -i $(DIR_PATCHES)/$(OCF_PATCH)