From 9ad3c74c44bbc5d52ea2e423582cbe1272d72254 Mon Sep 17 00:00:00 2001
From: moonman <moonman.ca@gmail.com>
Date: Mon, 5 Oct 2015 08:36:23 +0000
Subject: [PATCH] core/linux-kirkwood to 4.2.3-1

---
 core/linux-kirkwood/PKGBUILD | 37 ++++++++++++++++++------------------
 core/linux-kirkwood/config   | 21 +++++++++++++++++++-
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/core/linux-kirkwood/PKGBUILD b/core/linux-kirkwood/PKGBUILD
index 20414c7f8..b86f0b1b6 100644
--- a/core/linux-kirkwood/PKGBUILD
+++ b/core/linux-kirkwood/PKGBUILD
@@ -6,18 +6,18 @@ buildarch=2
 pkgbase=linux-kirkwood
 _kernelname=${pkgbase#linux}
 _desc="Marvell Kirkwood"
-pkgver=4.2.2
+pkgver=4.2.3
 srcver=${pkgver%.0}
 pkgrel=1
 cryptodev_commit=da730106c2558c8e0c8e1b1b1812d32ef9574ab7
 bfqver=v7r8
 
 ### BFQ patch kernel version
-# bfqkern=${pkgver:0:3}
-bfqkern=4.1
+bfqkern=${pkgver:0:3}
+# bfqkern=4.1
 
 ### AUFS branch name
-# aufsbranch="aufs${pkgver:0:3}"
+aufsbranch="aufs${pkgver:0:3}"
 # aufsbranch="aufs4.x-rcN"
 
 arch=('arm')
@@ -32,35 +32,36 @@ source=("https://kernel.org/pub/linux/kernel/v4.x/linux-${srcver}.tar.xz"
         'mach-types::http://www.arm.linux.org.uk/developer/machines/download.php'
         'usb-add-reset-resume-quirk-for-several-webcams.patch'
 	'0001-disable-mv643xx_eth-TSO.patch'
-#        "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
+        "git+https://github.com/sfjro/aufs4-standalone.git#branch=${aufsbranch}"
         "cryptodev-${cryptodev_commit}.tar.gz::https://github.com/cryptodev-linux/cryptodev-linux/archive/${cryptodev_commit}.tar.gz"
         "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0001-block-cgroups-kconfig-build-bits-for-BFQ-${bfqver}-${bfqkern}.patch"
         "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0002-block-introduce-the-BFQ-${bfqver}-I-O-sched-for-${bfqkern}.patch"
         "ftp://teambelgium.net/bfq/patches/${bfqkern}.0-${bfqver}/0003-block-bfq-add-Early-Queue-Merge-EQM-to-BFQ-${bfqver}-for-${bfqkern}.0.patch")
 
-md5sums=('96fa02a8cba28739b993042d668ad997'
+md5sums=('936530a3b28f38ec9dbfa1fcabe9acd4'
          '777d455648bd9d6017bc2620347596e8'
-         '17cbcffe875ed69b9d30e347438b4bea'
+         '0d88fa5e9166f3b88cd6b066edda174d'
          '5faf5d5f9aadf621942bd03c3b993947'
          '9b5a265440abf57d2052838f31486a3a'
          '09d44b9f07abfaeaf4f688ee52034786'
+         'SKIP'
          '8fb4d3b7cc970351f3b5078b7893a107'
-         '74bf103542cbdee0363819309adb97a2'
-         'f09baae3c7add4ed9bedde22ae3efe19'
-         'bd8cc19a31d1cf8aeeaf9245057c4f9b')
+         '82160f921c074b79a64a71b8d8945b06'
+         'd84e9d42dd3378d80af10120806609f7'
+         'b40833e6852e4c4c622836fe05dc6c71')
 
 prepare() {
   cd "${srcdir}/linux-${srcver}"
 
-#  msg2 "Copying aufs patches into the kernel source tree"
-#  cp -ru "${srcdir}/aufs4-standalone/"{Documentation,fs} "${srcdir}/linux-${srcver}/"
-#  cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" "${srcdir}/linux-${srcver}/include/"{linux/,uapi/linux/}
+  msg2 "Copying aufs patches into the kernel source tree"
+  cp -ru "${srcdir}/aufs4-standalone/"{Documentation,fs} "${srcdir}/linux-${srcver}/"
+  cp -ru "${srcdir}/aufs4-standalone/include/uapi/linux/aufs_type.h" "${srcdir}/linux-${srcver}/include/"{linux/,uapi/linux/}
 
-#  msg2 "Applying aufs patches"
-#  patch -Np1 -i ../aufs4-standalone/aufs4-kbuild.patch
-#  patch -Np1 -i ../aufs4-standalone/aufs4-base.patch
-#  patch -Np1 -i ../aufs4-standalone/aufs4-mmap.patch
-#  patch -Np1 -i ../aufs4-standalone/aufs4-standalone.patch
+  msg2 "Applying aufs patches"
+  patch -Np1 -i ../aufs4-standalone/aufs4-kbuild.patch
+  patch -Np1 -i ../aufs4-standalone/aufs4-base.patch
+  patch -Np1 -i ../aufs4-standalone/aufs4-mmap.patch
+  patch -Np1 -i ../aufs4-standalone/aufs4-standalone.patch
 
   msg2 "Disable buggy TCP segmentation offload implementation"
   msg2 "http://archlinuxarm.org/forum/viewtopic.php?f=9&t=7692"
diff --git a/core/linux-kirkwood/config b/core/linux-kirkwood/config
index c71a32784..1485e365e 100644
--- a/core/linux-kirkwood/config
+++ b/core/linux-kirkwood/config
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.2.1-2 Kernel Configuration
+# Linux/arm 4.2.3-1 Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -4832,6 +4832,25 @@ CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_PSTORE is not set
 # CONFIG_SYSV_FS is not set
 # CONFIG_UFS_FS is not set
+CONFIG_AUFS_FS=y
+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_XATTR=y
+# CONFIG_AUFS_FHSM is not set
+CONFIG_AUFS_RDU=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=m
 CONFIG_NFS_V2=m