diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-10 12:54:19 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-10 12:54:19 -0300 |
| commit | a3d7852d5512f059905b4a9029129fe1d1befd1e (patch) | |
| tree | 0f69d44f9b6e1fbae9f651f83fec52a1056428b3 /extra/lirc | |
| parent | 3282ccb6286f172872d887baf49e623c51e0a157 (diff) | |
| parent | 7b0cdd65ac7bcd3c7597b528a10de58e4e0a430f (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/virtualbox/PKGBUILD
extra/irqbalance/PKGBUILD
extra/lirc/PKGBUILD
extra/ruby/PKGBUILD
extra/xulrunner/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'extra/lirc')
| -rw-r--r-- | extra/lirc/PKGBUILD | 15 | ||||
| -rw-r--r-- | extra/lirc/lirc.install | 4 |
2 files changed, 10 insertions, 9 deletions
diff --git a/extra/lirc/PKGBUILD b/extra/lirc/PKGBUILD index 0a10e033f..502905d48 100644 --- a/extra/lirc/PKGBUILD +++ b/extra/lirc/PKGBUILD @@ -1,16 +1,17 @@ -# $Id: PKGBUILD 133620 2011-07-30 06:46:23Z ibiru $ +# $Id: PKGBUILD 142392 2011-11-08 22:38:56Z thomas $ # Maintainer: Paul Mattal <paul@archlinux.org> pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=6 +pkgrel=8 epoch=1 -_kernver=3.0-LIBRE +_extramodules=extramodules-3.1-LIBRE +_kernver="$(cat /lib/modules/${_extramodules}/version)" arch=('i686' 'x86_64' 'mips64el') url="http://www.lirc.org/" license=('GPL') -makedepends=('help2man' 'linux-libre-headers>=3.0' 'linux-libre-headers<3.1' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python') +makedepends=('help2man' 'linux-libre-headers>=3.1' 'linux-libre-headers<3.2' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -60,15 +61,15 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux-libre>=3.0' 'linux-libre<3.1') + depends=('lirc-utils' 'linux-libre>=3.1' 'linux-libre<3.2') replaces=('lirc+pctv') install=lirc.install cd "${srcdir}/lirc-${pkgver}/drivers" - make DESTDIR="${pkgdir}" install + make DESTDIR="${pkgdir}" moduledir="/lib/modules/${_extramodules}" install # set the kernel we've built for inside the install script - sed -i -e "s/KERNEL_VERSION=.*/KERNEL_VERSION=${_kernver}/g" "${startdir}/lirc.install" + sed -i -e "s/EXTRAMODULES=.*/EXTRAMODULES=${_extramodules}/g" "${startdir}/lirc.install" # gzip -9 modules find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \; } diff --git a/extra/lirc/lirc.install b/extra/lirc/lirc.install index 0d42e8a5c..1e7c4f4a1 100644 --- a/extra/lirc/lirc.install +++ b/extra/lirc/lirc.install @@ -1,9 +1,9 @@ -KERNEL_VERSION=3.0-ARCH +EXTRAMODULES=extramodules-3.1-ARCH post_install() { # updating module dependencies echo ">>> Updating module dependencies. Please wait ..." - depmod $KERNEL_VERSION > /dev/null 2>&1 + depmod $(cat /lib/modules/$EXTRAMODULES/version) > /dev/null 2>&1 } post_upgrade() { |