From b44e1a9ba42cd543e7f911cbc6102c29420a1fd8 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Tue, 25 Mar 2014 22:26:53 +0000 Subject: lirc: rebuild for kernel 3.13 --- abs/core/lirc/PKGBUILD | 14 ++++++------ abs/core/lirc/__changelog | 1 + abs/core/lirc/irexec.conf | 5 ----- abs/core/lirc/irexecd | 38 -------------------------------- abs/core/lirc/lirc.install | 2 +- abs/core/lirc/lirc.logrotate | 5 +++++ abs/core/lirc/lircd | 52 -------------------------------------------- abs/core/lirc/lircd.conf | 8 ------- abs/core/lirc/lircmd | 36 ------------------------------ 9 files changed, 14 insertions(+), 147 deletions(-) delete mode 100644 abs/core/lirc/irexec.conf delete mode 100755 abs/core/lirc/irexecd create mode 100644 abs/core/lirc/lirc.logrotate delete mode 100755 abs/core/lirc/lircd delete mode 100644 abs/core/lirc/lircd.conf delete mode 100755 abs/core/lirc/lircmd diff --git a/abs/core/lirc/PKGBUILD b/abs/core/lirc/PKGBUILD index 666865f..5a9d5e5 100644 --- a/abs/core/lirc/PKGBUILD +++ b/abs/core/lirc/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 202757 2013-12-26 13:05:51Z thomas $ +# $Id$ # Maintainer: Paul Mattal pkgbase=lirc pkgname=('lirc' 'lirc-utils') pkgver=0.9.0 -pkgrel=67 +pkgrel=70 epoch=1 -_extramodules=extramodules-3.12-ARCH +_extramodules=extramodules-3.13-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>=3.12' 'linux<3.13' 'linux-headers>=3.12' 'linux-headers<3.13' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair') +makedepends=('help2man' 'linux>=3.13' 'linux<3.14' 'linux-headers>=3.13' 'linux-headers<3.14' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2' 'iguanair') options=('!makeflags' '!strip') source=(http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${pkgver}.tar.bz2 lirc_wpc8769l.patch @@ -67,7 +67,7 @@ build() { cd "${srcdir}/lirc-${pkgver}" PYTHON=python2 ./configure --enable-sandboxed --prefix=/usr \ - --with-driver=all --with-kerneldir=/usr/src/linux-${_kernver}/ \ + --with-driver=all --with-kerneldir=/usr/lib/modules/${_kernver}/build \ --with-moduledir=/usr/lib/modules/${_kernver}/kernel/drivers/misc \ --sbindir=/usr/bin --with-transmitter @@ -82,7 +82,7 @@ build() { package_lirc() { pkgdesc="Linux Infrared Remote Control kernel modules for stock arch kernel" - depends=('lirc-utils' 'linux>=3.12' 'linux<3.13' 'iguanair') + depends=('lirc-utils' 'linux>=3.13' 'linux<3.14') replaces=('lirc+pctv') install=lirc.install @@ -97,7 +97,7 @@ package_lirc() { package_lirc-utils() { pkgdesc="Linux Infrared Remote Control utils" - depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'iguanair') + depends=('alsa-lib' 'libx11' 'libftdi-compat' 'libirman') optdepends=('python2: pronto2lirc utility') options=('strip') install=lirc-utils.install diff --git a/abs/core/lirc/__changelog b/abs/core/lirc/__changelog index 19c9302..c0068c0 100644 --- a/abs/core/lirc/__changelog +++ b/abs/core/lirc/__changelog @@ -1 +1,2 @@ added 'iguanair' to make depends and package depends +change configure kerneldir for 3.13 moving src to --with-kerneldir=/usr/lib/modules/${_kernver}/build diff --git a/abs/core/lirc/irexec.conf b/abs/core/lirc/irexec.conf deleted file mode 100644 index f911c75..0000000 --- a/abs/core/lirc/irexec.conf +++ /dev/null @@ -1,5 +0,0 @@ -# -# Parameters for irexec daemon (path to lircrc) -# - -IREXEC_OPTS="" \ No newline at end of file diff --git a/abs/core/lirc/irexecd b/abs/core/lirc/irexecd deleted file mode 100755 index a64b033..0000000 --- a/abs/core/lirc/irexecd +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/irexec.conf - -PID=`pidof -o %PPID /usr/bin/irexec` -case "$1" in - start) - stat_busy "Starting IREXEC Daemon" - [ -z "$PID" ] && /usr/bin/irexec --daemon $IREXEC_OPTS - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon irexecd - stat_done - fi - ;; - stop) - stat_busy "Stopping IREXEC Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon irexecd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 - diff --git a/abs/core/lirc/lirc.install b/abs/core/lirc/lirc.install index 31d4bcf..8e5460a 100644 --- a/abs/core/lirc/lirc.install +++ b/abs/core/lirc/lirc.install @@ -1,4 +1,4 @@ -EXTRAMODULES=extramodules-3.12-ARCH +EXTRAMODULES=extramodules-3.13-ARCH post_install() { # updating module dependencies diff --git a/abs/core/lirc/lirc.logrotate b/abs/core/lirc/lirc.logrotate new file mode 100644 index 0000000..623c4f3 --- /dev/null +++ b/abs/core/lirc/lirc.logrotate @@ -0,0 +1,5 @@ +/var/log/lircd { + missingok + notifempty + delaycompress +} diff --git a/abs/core/lirc/lircd b/abs/core/lirc/lircd deleted file mode 100755 index e9739b3..0000000 --- a/abs/core/lirc/lircd +++ /dev/null @@ -1,52 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/lircd.conf - -PID=$(pidof -o %PPID /usr/sbin/lircd) -LIRCD_SYMLINKFILE=/dev/lircd -LIRCD_SOCKET=/var/run/lirc/lircd -case "$1" in - start) - stat_busy "Starting LIRC Daemon" - [ ! -d /var/run/lirc ] && install -d /var/run/lirc &>/dev/null - rm -f $LIRCD_SOCKET && ln -s $LIRCD_SOCKET $LIRCD_SYMLINKFILE - if [ $? -ne 0 ]; then - stat_fail - exit 0 - fi - [ -n "$LIRC_DRIVER" ] && LIRC_EXTRAOPTS="-H $LIRC_DRIVER $LIRC_EXTRAOPTS" - [ -z "$PID" ] && - if [ -n "$LIRC_DEVICE" ] ; then - eval /usr/sbin/lircd -d "$LIRC_DEVICE" $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - else - /usr/sbin/lircd $LIRC_EXTRAOPTS $LIRC_CONFIGFILE - fi - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircd - stat_done - fi - ;; - stop) - stat_busy "Stopping LIRC Daemon" - rm -f $LIRCD_SYMLINKFILE - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 start|stop|restart" -esac -exit 0 diff --git a/abs/core/lirc/lircd.conf b/abs/core/lirc/lircd.conf deleted file mode 100644 index 760dab0..0000000 --- a/abs/core/lirc/lircd.conf +++ /dev/null @@ -1,8 +0,0 @@ -# -# Parameters for lirc daemon -# - -LIRC_DEVICE="/dev/lirc0" -LIRC_DRIVER="" -LIRC_EXTRAOPTS="" -LIRC_CONFIGFILE="" diff --git a/abs/core/lirc/lircmd b/abs/core/lirc/lircmd deleted file mode 100755 index 220c47c..0000000 --- a/abs/core/lirc/lircmd +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions - -PID=`pidof -o %PPID /usr/sbin/lircmd` -case "$1" in - start) - stat_busy "Starting lircmd Daemon" - [ -z "$PID" ] && /usr/sbin/lircmd - if [ $? -gt 0 ]; then - stat_fail - else - add_daemon lircmd - stat_done - fi - ;; - stop) - stat_busy "Stopping lircmd Daemon" - [ ! -z "$PID" ] && kill $PID &> /dev/null - if [ $? -gt 0 ]; then - stat_fail - else - rm_daemon lircmd - stat_done - fi - ;; - restart) - $0 stop - sleep 1 - $0 start - ;; - *) - echo "usage: $0 {start|stop|restart}" -esac -exit 0 -- cgit v0.12