diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-31 13:59:08 -0300 |
commit | ca4b95e91b33e5b8f02a063862359ab00c5260d5 (patch) | |
tree | 872d6a54fa0e59e017aa3101880d82f0e54fb70a /kernels/aufs3-libre | |
parent | 041ebdb9062909e39f81cca8c491c7f8adeed2a3 (diff) | |
parent | 2ed96c6eb798c762b61a93a8b4cf80220c00ac1f (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libvirt/PKGBUILD
community/opendkim/opendkim.rc
core/nfs-utils/blkmapd.service
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libssh2/PKGBUILD
multilib/lib32-libx11/PKGBUILD
multilib/lib32-qt/PKGBUILD
testing/php/PKGBUILD
testing/xorg-server/PKGBUILD
~fauno/notmuch/PKGBUILD
Diffstat (limited to 'kernels/aufs3-libre')
-rw-r--r-- | kernels/aufs3-libre/PKGBUILD | 11 | ||||
-rw-r--r-- | kernels/aufs3-libre/aufs3-libre.install | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/kernels/aufs3-libre/PKGBUILD b/kernels/aufs3-libre/PKGBUILD index 6c593e2c2..b27b14117 100644 --- a/kernels/aufs3-libre/PKGBUILD +++ b/kernels/aufs3-libre/PKGBUILD @@ -4,14 +4,14 @@ # Contributor (Parabola): Márcio Silva <coadde@adinet.com.uy> pkgname=aufs3-libre -pkgver=3.2_20120109 -pkgrel=2 +pkgver=3.3_20120430 +pkgrel=1 # Set to whatever the tree of your aufs-libre-friendly kernel is, and set the right dependency. #_kernver=${pkgver%_*}-LIBRE #depends=('aufs_friendly') -_kernver=3.2-LIBRE-AUFS_FRIENDLY +_kernver=3.3-LIBRE-AUFS_FRIENDLY depends=('linux-libre-aufs_friendly' 'linux-libre-aufs_friendly-headers') pkgdesc="Another UnionFS implementation" @@ -19,12 +19,12 @@ arch=('i686' 'x86_64') url="http://aufs.sourceforge.net/" license=('GPL2') replaces=('aufs' 'aufs2' 'aufs3') -conflicts=('aufs3') +conflicts=('aufs2' 'aufs3') provides=("aufs3=$pkgver") install=aufs3-libre.install source=("http://calimeroteknik.free.fr/src/aufs3-${pkgver}.tar.gz") options=('!makeflags' '!strip') -md5sums=('35dd55adc3f403f532ebe6d8fb354c77') +md5sums=('70ccfcf9914ce46ba7cbab42444b6ce8') build() { cd "${srcdir}/aufs3-${pkgver}" @@ -52,6 +52,7 @@ build() { # build, sed fixes are from gentoo portage build sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile sed -i "s:__user::g" include/linux/aufs_type.h + ln -s "/usr/src/linux-$(</lib/modules/extramodules-${_kernver}/version)/include/linux/mount.h" fs/mount.h make KDIR="/usr/src/linux-$(</lib/modules/extramodules-${_kernver}/version)" } diff --git a/kernels/aufs3-libre/aufs3-libre.install b/kernels/aufs3-libre/aufs3-libre.install index e08b76b54..fc48ad506 100644 --- a/kernels/aufs3-libre/aufs3-libre.install +++ b/kernels/aufs3-libre/aufs3-libre.install @@ -1,5 +1,5 @@ post_install() { - KERNEL_VERSION=3.2-LIBRE-AUFS_FRIENDLY + KERNEL_VERSION=3.3-LIBRE-AUFS_FRIENDLY depmod $(cat /lib/modules/extramodules-$KERNEL_VERSION/version) } |