diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 09:36:19 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2012-06-17 09:36:19 +0200 |
| commit | cb08e4a8bd52e55b2d425484b9fd2fe357f663c3 (patch) | |
| tree | 03aa7b8ad93cd8815a1c1be95b563a667d92d6b8 /community/cdfs | |
| parent | fb62b6371fdc9ffe50d30c698f13ea1fb39c215b (diff) | |
| parent | 61f450a3578b7e51c337e1a687c0cef2bc07ff35 (diff) | |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el
Conflicts:
extra/lirc/PKGBUILD
extra/php/PKGBUILD
multilib/lib32-keyutils/PKGBUILD
multilib/lib32-util-linux/PKGBUILD
staging/clamav/PKGBUILD
testing/sysvinit/PKGBUILD
Diffstat (limited to 'community/cdfs')
| -rw-r--r-- | community/cdfs/PKGBUILD | 11 | ||||
| -rw-r--r-- | community/cdfs/cdfs-3.4.patch | 12 |
2 files changed, 19 insertions, 4 deletions
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index 5bb5acaa5..56ed891b3 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 70326 2012-05-04 17:03:53Z spupykin $ +# $Id: PKGBUILD 72481 2012-06-15 13:19:51Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=21 +pkgrel=22 pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files." arch=(i686 x86_64 'mips64el') url="http://www.elis.UGent.be/~ronsse/cdfs/" @@ -13,10 +13,12 @@ makedepends=('linux-headers') install=cdfs.install source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2" "cdfs-3.0.patch" - "cdfs-3.2.patch") + "cdfs-3.2.patch" + "cdfs-3.4.patch") md5sums=('ac64c014a90e3c488394832ea29605b3' 'aba7da94a9dcbb8a93ea423cb6958fef' - 'e934407b3460257a301822ffc4ab3933') + 'e934407b3460257a301822ffc4ab3933' + '9215e7bdac728bd2f889fb525e543454') build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` @@ -26,6 +28,7 @@ build() { cd $srcdir/$pkgname-$pkgver patch -p1 <$srcdir/cdfs-3.0.patch patch -p1 <$srcdir/cdfs-3.2.patch + patch -p1 <$srcdir/cdfs-3.4.patch make KDIR=/lib/modules/${_kernverfull}/build install -Dm0644 cdfs.ko $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install diff --git a/community/cdfs/cdfs-3.4.patch b/community/cdfs/cdfs-3.4.patch new file mode 100644 index 000000000..5c2cb9b24 --- /dev/null +++ b/community/cdfs/cdfs-3.4.patch @@ -0,0 +1,12 @@ +diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c +--- cdfs-2.6.27/root.c 2009-12-21 16:38:31.000000000 +0300 ++++ cdfs-2.6.27.my/root.c 2012-06-15 17:09:27.000000000 +0400 +@@ -375,7 +375,7 @@ + + PRINT("retinode = %ld\n", retinode->i_ino); + +- sb->s_root = d_alloc_root(retinode); ++ sb->s_root = d_make_root(retinode); + + cdfs_proc_cd = this_cd; + |