From 3de5157bfd88ba0d6d4a036ba02ee5216c677af5 Mon Sep 17 00:00:00 2001 From: James Meyer Date: Wed, 28 Nov 2012 09:25:10 -0600 Subject: lirc 0.9 recompile for new kernel --- abs/core/lirc/PKGBUILD | 28 ++++++++++++++++++++-------- abs/core/lirc/__changelog | 2 +- abs/core/lirc/irexec.service | 11 +++++++++++ abs/core/lirc/lirc-utils.install | 7 +++++++ abs/core/lirc/lirc.install | 2 +- abs/core/lirc/lirc.service | 11 +++++++++++ abs/core/lirc/lirc.tmpfiles | 1 + abs/core/lirc/lircm.service | 11 +++++++++++ 8 files changed, 63 insertions(+), 10 deletions(-) create mode 100644 abs/core/lirc/irexec.service create mode 100644 abs/core/lirc/lirc-utils.install create mode 100644 abs/core/lirc/lirc.service create mode 100644 abs/core/lirc/lirc.tmpfiles create mode 100644 abs/core/lirc/lircm.service diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index a7654a8..956b1e5 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -1,24 +1,27 @@ -# $Id: PKGBUILD 163879 2012-07-21 12:01:55Z tpowa $ +# $Id: PKGBUILD 170041 2012-10-31 07:25:00Z tpowa $ # Maintainer: Paul Mattal pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=22 +pkgrel=34 epoch=1 -_extramodules=extramodules-3.4-ARCH +_extramodules=extramodules-3.6-ARCH arch=('i686' 'x86_64') url="http://www.lirc.org/" license=('GPL') ### NOTICE don't forget to bump version in depends in package_lirc -makedepends=('help2man' 'linux-headers>=3.4' 'linux-headers<3.5' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2' 'iguanair') +makedepends=('help2man' 'linux-headers>=3.6' 'linux-headers<3.7' 'alsa-lib' 'libx11' 'libftdi' 'libirman' 'python2' 'iguanair') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch lircd-handle-large-config.patch lirc_atiusb-kfifo.patch kernel-2.6.39.patch - lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd) + lircd lircmd lirc.logrotate lircd.conf irexec.conf irexecd + lirc.service lircm.service irexec.service + lirc.tmpfiles + ) build() { _kernver="$(cat /usr/lib/modules/${_extramodules}/version)" @@ -51,7 +54,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.4' 'linux<3.5' 'iguanair') + depends=('lirc-utils' 'linux>=3.6' 'linux<3.7' 'iguanair') replaces=('lirc+pctv') install=lirc.install @@ -66,15 +69,20 @@ package_lirc() { package_lirc-utils() { pkgdesc="Linux Infrared Remote Control utils" - depends=('alsa-lib' 'libx11' 'libftdi' 'libirman' 'iguanair') + depends=('alsa-lib' 'libx11' 'libftdi' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip' '!libtool') backup=('etc/conf.d/lircd.conf' 'etc/conf.d/irexec.conf') + install=lirc-utils.install cd "${srcdir}/lirc-${pkgver}" make DESTDIR="${pkgdir}" install install -d "${pkgdir}/usr/share/lirc" "${pkgdir}/etc/rc.d" cp "${srcdir}"/{lircd,lircmd,irexecd} "${pkgdir}/etc/rc.d" + install -D -m644 "${srcdir}"/lirc.service "${pkgdir}"/usr/lib/systemd/system/lirc.service + install -D -m644 "${srcdir}"/lircm.service "${pkgdir}"/usr/lib/systemd/system/lircm.service + install -D -m644 "${srcdir}"/irexec.service "${pkgdir}"/usr/lib/systemd/system/irexec.service + install -D -m644 "${srcdir}"/lirc.tmpfiles "${pkgdir}"/usr/lib/tmpfiles.d/lirc.conf cp -rp remotes "${pkgdir}/usr/share/lirc" chmod -R go-w "${pkgdir}/usr/share/lirc/" @@ -102,4 +110,8 @@ md5sums=('b232aef26f23fe33ea8305d276637086' '3deb02604b37811d41816e9b4385fcc3' '5b1f8c9cd788a39a6283f93302ce5c6e' 'f0c0ac930326168035f0c8e24357ae55' - '69d099e6deedfa3c1ee2b6e82d9b8bfb') + '69d099e6deedfa3c1ee2b6e82d9b8bfb' + 'dab8a73bcc5fd5479d8750493d8d97dc' + 'c2e20fe68b034df752dba2773db16ebe' + '07131d117fcfe9dcd50c453c3a5e9531' + 'febf25c154a7d36f01159e84f26c2d9a') diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index e9442d0..19c9302 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -1 +1 @@ -iguanir +added 'iguanair' to make depends and package depends diff --git a/abs/core/lirc/irexec.service b/abs/core/lirc/irexec.service new file mode 100644 index 0000000..5d7915b --- /dev/null +++ b/abs/core/lirc/irexec.service @@ -0,0 +1,11 @@ +[Unit] +Description=IR Exec +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/bin/irexec --daemon +Type=forking + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/lirc/lirc-utils.install b/abs/core/lirc/lirc-utils.install new file mode 100644 index 0000000..293d1ed --- /dev/null +++ b/abs/core/lirc/lirc-utils.install @@ -0,0 +1,7 @@ +post_install() { + systemd-tmpfiles --create lirc.conf +} + +post_upgrade() { + post_install +} diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index c35848a..a9f1c5c 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.4-ARCH +EXTRAMODULES=extramodules-3.6-ARCH post_install() { # updating module dependencies diff --git a/abs/core/lirc/lirc.service b/abs/core/lirc/lirc.service new file mode 100644 index 0000000..953601f --- /dev/null +++ b/abs/core/lirc/lirc.service @@ -0,0 +1,11 @@ +[Unit] +Description=Linux Infrared Remote Control + +[Service] +ExecStartPre=/usr/bin/ln -sf /run/lirc/lircd /dev/lircd +ExecStart=/usr/sbin/lircd --pidfile=/run/lirc/lircd.pid +Type=forking +PIDFile=/run/lirc/lircd.pid + +[Install] +WantedBy=multi-user.target diff --git a/abs/core/lirc/lirc.tmpfiles b/abs/core/lirc/lirc.tmpfiles new file mode 100644 index 0000000..0b80e2e --- /dev/null +++ b/abs/core/lirc/lirc.tmpfiles @@ -0,0 +1 @@ +d /run/lirc 0755 root root - diff --git a/abs/core/lirc/lircm.service b/abs/core/lirc/lircm.service new file mode 100644 index 0000000..6b258e3 --- /dev/null +++ b/abs/core/lirc/lircm.service @@ -0,0 +1,11 @@ +[Unit] +Description=LIRC Mouse +After=lirc.service +Wants=lirc.service + +[Service] +ExecStart=/usr/sbin/lircmd -u +Type=forking + +[Install] +WantedBy=multi-user.target -- cgit v0.12