Merge branch 'master' of github.com:archlinuxarm/PKGBUILDs

aur/aufs3-util/PKGBUILD

@@ -0,0 +1,24 @@
+# Maintainer: Calimero <calimerotekni@free.fr>
+
+plugrel=1
+noautobuild=1
+
+pkgname=aufs3-util
+pkgver=20111216
+pkgrel=1
+pkgdesc="Another Unionfs Implementation that supports NFS branches"
+arch=('i686' 'x86_64')
+url="http://aufs.sourceforge.net/"
+license=('GPL2')
+source=("http://calimeroteknik.free.fr/src/${pkgname}-${pkgver}.tar.gz")
+md5sums=('aa0018796455a3709c9c29e457fe3a95')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}

community/nodejs/PKGBUILD

@@ -7,7 +7,7 @@
 # Contributor: Jason Plum <max@warheads.net>
 
 pkgname=nodejs
-pkgver=0.6.10
+pkgver=0.6.11
 pkgrel=1
 plugrel=3
 pkgdesc='Evented I/O for V8 javascript'

core/linux-omap/PKGBUILD

@@ -13,7 +13,7 @@ pkgname=('linux-omap' 'linux-headers-omap')
 _kernelname=${pkgname#linux}
 _basekernel=3.2
 pkgver=${_basekernel}.6
-pkgrel=1
+pkgrel=2
 arch=('arm')
 url="http://www.kernel.org/"
 license=('GPL2')
@@ -24,13 +24,15 @@ source=("ftp://ftp.kernel.org/pub/linux/kernel/v3.x/linux-${_basekernel}.tar.xz"
         "rcn-ee.diff.gz::http://rcn-ee.net/deb/sid-armhf/v3.2.6-x4/patch-3.2.6-x4.diff.gz"
         'config'
         'change-default-console-loglevel.patch'
-        '0006-omap4-usb-improvement.patch')
+        '0006-omap4-usb-improvement.patch'
+        'aufs3-3.2.patch.gz')
 md5sums=('364066fa18767ec0ae5f4e4abcf9dc51'
          '2bd4679899df503177a3b61ae2068749'
          '9a38f8bff01e024ea9c82a81bf2b81c3'
-         '0c09bb6de961a88352025e575804a4f0'
+         '7a43a1c577431757284639bb059af6f2'
          '9d3c56a4b999c8bfbd4018089a62f662'
-         'd4c22c6f6c8c53d595552b6285aeab79')
+         'd4c22c6f6c8c53d595552b6285aeab79'
+         '6ea7b005a74be27abb072c934ef15a2c')
 
 build() {
   cd "${srcdir}/linux-${_basekernel}"
@@ -45,9 +47,10 @@ build() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -Np1 -i "${srcdir}/change-default-console-loglevel.patch"
 
-  # rcn-ee patchset
+  # ALARM patches
   patch -Np1 -i "${srcdir}/rcn-ee.diff"
   patch -Np1 -i "${srcdir}/0006-omap4-usb-improvement.patch"
+  patch -Np1 -i "${srcdir}/aufs3-3.2.patch"
 
   cat "${srcdir}/config" > ./.config
 
@@ -86,7 +89,7 @@ package_linux-omap() {
   groups=('base')
   depends=('coreutils' 'linux-firmware' 'module-init-tools>=3.16' 'mkinitcpio>=0.7')
   optdepends=('crda: to set the correct wireless channels of your country')
-  provides=('kernel26' 'kernel26-omap' 'linux=${pkgver}')
+  provides=('kernel26' 'kernel26-omap' 'linux=${pkgver}' 'aufs_friendly')
   conflicts=('kernel26-omap' 'linux-tegra')
   replaces=('kernel26-omap')
   backup=("etc/mkinitcpio.d/${pkgname}.preset")

core/linux-omap/config

@@ -3704,6 +3704,25 @@ CONFIG_ROMFS_ON_BLOCK=y
 # CONFIG_PSTORE is not set
 CONFIG_SYSV_FS=m
 # 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 is not set
+# CONFIG_AUFS_HFSNOTIFY is not set
+# CONFIG_AUFS_EXPORT is not set
+CONFIG_AUFS_RDU=y
+CONFIG_AUFS_PROC_MAP=y
+CONFIG_AUFS_SP_IATTR=y
+# CONFIG_AUFS_SHWH is not set
+# CONFIG_AUFS_BR_RAMFS is not set
+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_V3=y

core/linux-omap/linux-omap.install

@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-omap
-KERNEL_VERSION=3.2.6-1-ARCH
+KERNEL_VERSION=3.2.6-2-ARCH
 
 post_install () {
   # updating module dependencies