diff options
| author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
|---|---|---|
| committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-07-17 16:14:15 -0300 |
| commit | 70877cfb7e290449b9f9c660e25345f462576c4c (patch) | |
| tree | 0f63651432b8448262549265a5420fff1ab665e8 /community/cdfs | |
| parent | 509bf50c73444930b6f57c42678ec22e7de82c88 (diff) | |
| parent | 412d061bfbf23d1e908eed3f8405b1af46fb1ba8 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/electricsheep/PKGBUILD
community-testing/gnash/PKGBUILD
community-testing/performous/PKGBUILD
community/drbd/PKGBUILD
community/oss/PKGBUILD
community/pinot/PKGBUILD
core/glibc/PKGBUILD
core/kmod/PKGBUILD
core/pkg-config/PKGBUILD
core/systemd/PKGBUILD
extra/bitlbee/PKGBUILD
extra/mesa/PKGBUILD
extra/nettle/PKGBUILD
extra/xfce4-netload-plugin/PKGBUILD
kde-unstable/kdepim/PKGBUILD
multilib/lib32-glibc/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/lib32-mpg123/PKGBUILD
multilib/lib32-nettle/PKGBUILD
multilib/lib32-nouveau-dri/PKGBUILD
multilib/lib32-pcre/PKGBUILD
multilib/lib32-readline/PKGBUILD
multilib/zsnes/PKGBUILD
multilib/zsnes/zsnes.patch
testing/cryptsetup/PKGBUILD
testing/ekiga/PKGBUILD
testing/iputils/PKGBUILD
testing/poppler/PKGBUILD
testing/util-linux/PKGBUILD
testing/util-linux/util-linux.install
Diffstat (limited to 'community/cdfs')
| -rw-r--r-- | community/cdfs/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/cdfs/cdfs.install | 12 |
2 files changed, 11 insertions, 11 deletions
diff --git a/community/cdfs/PKGBUILD b/community/cdfs/PKGBUILD index 56ed891b3..71b7c99f3 100644 --- a/community/cdfs/PKGBUILD +++ b/community/cdfs/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 72481 2012-06-15 13:19:51Z spupykin $ +# $Id: PKGBUILD 73696 2012-07-14 13:06:31Z allan $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar> pkgname=cdfs pkgver=2.6.27 -pkgrel=22 +pkgrel=23 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/" @@ -23,13 +23,13 @@ md5sums=('ac64c014a90e3c488394832ea29605b3' build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`") - _kernverfull=`cat /lib/modules/extramodules-3.${_kernver}-ARCH/version` + _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version` 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 + make KDIR=/usr/lib/modules/${_kernverfull}/build + install -Dm0644 cdfs.ko $pkgdir/usr/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.install b/community/cdfs/cdfs.install index d24929157..6be46f6d5 100644 --- a/community/cdfs/cdfs.install +++ b/community/cdfs/cdfs.install @@ -1,14 +1,14 @@ post_install() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + EXTRAMODULES='extramodules-3.4-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |