linux PKGBUILD adjusted for aufs patches

linux/PKGBUILD

@@ -9,26 +9,42 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=${pkgname#linux}
 _basekernel=3.4
-pkgver=${_basekernel}
+pkgver=${_basekernel}.1
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.kernel.org/"
 license=('GPL2')
 makedepends=('xmlto' 'docbook-xsl')
 options=('!strip')
-source=("ftp://ftp.archlinux.org/other/linux/linux-3.4.tar.xz"
-        #"http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz"
+source=("http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.1.tar.bz2"
         #"http://www.kernel.org/pub/linux/kernel/v3.x/patch-${pkgver}.xz"
         # the main kernel config files
         'config' 'config.x86_64'
+        #aufs patches
+        'aufs3-loopback.patch'
+        'aufs3-base.patch'
+        'aufs3-proc_map.patch'
+        'aufs3-fix-export-__devcgroup_inode_permission.patch'
+        'aufs3-standalone.patch'
+        'aufs3-kbuild.patch'
+        'aufs3.patch'
+        'config.aufs'
         # standard config files for mkinitcpio ramdisk
         "${pkgname}.preset"
         'fix-acerhdf-1810T-bios.patch'
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch')
-md5sums=('cba7741056c05ac98277b99909039a7e'
+md5sums=('3b101768a97ec65292b55c02bf0a8c7a'
          '0c9de293b4d34d2d91de453592c4a89f'
-         '4c54e74f4f05714e3682317e5bde4fd4'
+         '594d958690a589b0d762992fe346230e'
+         'cf3820c34cb37eb9d52f565b113432ab'
+         'af987a06ae369a1aa2c1b53621bf71f3'
+         'eefdf533f13bdfa90937856e3e97f981'
+         '9dc1aa9fcc12b3c2f52f605830c02939'
+         'ee8123b76008a6a79764ed90fb8ba635'
+         '4245486a126775e5a6e469fd6f7484f1'
+         '28761067a33e8a359700480c8a7541e4'
+         '52f4a2c7f6277774117c834d949d6b81'
          'eb14dcfd80c00852ef81ded6e826826a'
          '3cb9e819538197398aad5db5529b22d6'
          '65cbe8e4c8efaf96dd162102e46ce81d'
@@ -44,23 +60,25 @@ build() {
   # http://git.kernel.org/?p=linux/kernel/git/stable/stable-queue.git
 
   # Some chips detect a ghost TV output
-  # mailing list discussion: http://lists.freedesktop.org/archives/intel-gfx/2011-April/010371.html
-  # Arch Linux bug report: FS#19234
-  #
-  # It is unclear why this patch wasn't merged upstream, it was accepted,
-  # then dropped because the reasoning was unclear. However, it is clearly
-  # needed.
-  patch -Np1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
+  patch -p1 -i "${srcdir}/i915-fix-ghost-tv-output.patch"
 
   # Patch submitted upstream, waiting for inclusion:
   # https://lkml.org/lkml/2012/2/19/51
   # add support for latest bios of Acer 1810T acerhdf module
-  patch -Np1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch"
+  patch -p1 -i "${srcdir}/fix-acerhdf-1810T-bios.patch"
 
   # set DEFAULT_CONSOLE_LOGLEVEL to 4 (same value as the 'quiet' kernel param)
   # remove this when a Kconfig knob is made available by upstream
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
-  patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
+  patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
+
+  #aufs patches for Live:
+  patch -p1 -i "${srcdir}/aufs3-loopback.patch"
+  patch -p1 -i "${srcdir}/aufs3-base.patch"
+  patch -p1 -i "${srcdir}/aufs3-proc_map.patch"
+  patch -p1 -i "${srcdir}/aufs3-fix-export-__devcgroup_inode_permission.patch"
+  patch -p1 -i "${srcdir}/aufs3-standalone.patch"
+  patch -p1 -i "${srcdir}/aufs3.patch"
 
   if [ "${CARCH}" = "x86_64" ]; then
     cat "${srcdir}/config.x86_64" > ./.config
@@ -68,6 +86,8 @@ build() {
     cat "${srcdir}/config" > ./.config
   fi
 
+    cat "${srcdir}/config.aufs" >> ./.config
+
   if [ "${_kernelname}" != "" ]; then
     sed -i "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_kernelname}\"|g" ./.config
   fi

linux/config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 3.4.0-1 Kernel Configuration
+# Linux/i386 3.4.1-1 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -58,7 +58,7 @@ CONFIG_IRQ_WORK=y
 CONFIG_EXPERIMENTAL=y
 CONFIG_INIT_ENV_ARG_LIMIT=32
 CONFIG_CROSS_COMPILE=""
-CONFIG_LOCALVERSION="-ARCH"
+CONFIG_LOCALVERSION="-CHAKRA"
 CONFIG_LOCALVERSION_AUTO=y
 CONFIG_HAVE_KERNEL_GZIP=y
 CONFIG_HAVE_KERNEL_BZIP2=y

linux/config.x86_64

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 3.4.0-1 Kernel Configuration
+# Linux/x86_64 3.4.1-1 Kernel Configuration
 #
 CONFIG_64BIT=y
 # CONFIG_X86_32 is not set