From 2dc84fd542343f3d294e427ec2d2c6916dd6c22d Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 28 Jan 2014 03:50:12 +0000
Subject: [PATCH] core/linux-armv7 to 3.13.0-2

---
 core/linux-armv7/PKGBUILD | 23 ++++++++++++-----------
 core/linux-armv7/config   | 18 ++++++++++++++++++
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD
index e039ca117..23af49a62 100644
--- a/core/linux-armv7/PKGBUILD
+++ b/core/linux-armv7/PKGBUILD
@@ -8,7 +8,7 @@ _srcname=linux-3.13
 _kernelname=${pkgbase#linux}
 _desc="ARMv7 multi-platform"
 pkgver=3.13.0
-pkgrel=1
+pkgrel=2
 rcnrel=armv7-x9
 arch=('armv7h')
 url="http://www.kernel.org/"
@@ -18,7 +18,7 @@ options=('!strip')
 source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
 #        "http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         "http://rcn-ee.net/deb/sid-armhf/v${pkgver}-${rcnrel}/patch-${pkgver%.0}-${rcnrel}.diff.gz"
-#        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_srcname#linux-}"
+        "git://git.code.sf.net/p/aufs/aufs3-standalone#branch=aufs${_srcname#linux-}"
         '0001-atags-add-support-for-marvell-uboot.patch'
         '0002-atags-retrieve-mac-addresses.patch'
         'smile.patch'
@@ -26,11 +26,12 @@ source=("http://www.kernel.org/pub/linux/kernel/v3.x/${_srcname}.tar.xz"
         'config')
 md5sums=('0ecbaf65c00374eb4a826c2f9f37606f'
          'ed7cdb79cd786aad89a995d95c5b6232'
+         'SKIP'
          '3ad860d0d6daedc82091ea29c9730b95'
          '02cce6b8f88c4392f552b14d0bf2e71c'
          '15482d66eaaf0237f0cc6a61f36365b3'
          '911bffe9c261ca5b91dd0a083d99e81f'
-         'b36ad875df99272f365ff7e95088285b')
+         '89cf5f313eacc87220a3b3f610dcbdb6')
 
 prepare() {
   cd "${srcdir}/${_srcname}"
@@ -48,15 +49,15 @@ prepare() {
   patch -p1 -i ../mmc.patch
 
   # AUFS patches
-#  cp -ru "${srcdir}/aufs3-standalone/Documentation" .
-#  cp -ru "${srcdir}/aufs3-standalone/fs" .
-#  cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux
-#  cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
+  cp -ru "${srcdir}/aufs3-standalone/Documentation" .
+  cp -ru "${srcdir}/aufs3-standalone/fs" .
+  cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/linux
+  cp -ru "${srcdir}/aufs3-standalone/include/uapi/linux/aufs_type.h" ./include/uapi/linux
 
-#  patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch
-#  patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
-#  patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
-#  patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
+  patch -Np1 -i ../aufs3-standalone/aufs3-kbuild.patch
+  patch -Np1 -i ../aufs3-standalone/aufs3-base.patch
+  patch -Np1 -i ../aufs3-standalone/aufs3-mmap.patch
+  patch -Np1 -i ../aufs3-standalone/aufs3-standalone.patch
 
   cat "${srcdir}/config" > ./.config
 
diff --git a/core/linux-armv7/config b/core/linux-armv7/config
index b53da9a23..565884953 100644
--- a/core/linux-armv7/config
+++ b/core/linux-armv7/config
@@ -5436,6 +5436,24 @@ CONFIG_F2FS_FS_XATTR=y
 CONFIG_F2FS_FS_POSIX_ACL=y
 CONFIG_F2FS_FS_SECURITY=y
 # CONFIG_F2FS_CHECK_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_SBILIST=y
+CONFIG_AUFS_HNOTIFY=y
+CONFIG_AUFS_HFSNOTIFY=y
+CONFIG_AUFS_EXPORT=y
+CONFIG_AUFS_RDU=y
+CONFIG_AUFS_SP_IATTR=y
+CONFIG_AUFS_SHWH=y
+CONFIG_AUFS_BR_RAMFS=y
+CONFIG_AUFS_BR_FUSE=y
+CONFIG_AUFS_POLL=y
+CONFIG_AUFS_BR_HFSPLUS=y
+CONFIG_AUFS_BDEV_LOOP=y
+# CONFIG_AUFS_DEBUG is not set
 CONFIG_NETWORK_FILESYSTEMS=y
 CONFIG_NFS_FS=y
 CONFIG_NFS_V2=y