archr/Arch-R
0
0
Fork 0
mirror of https://github.com/archr-linux/Arch-R.git synced 2026-03-31 14:41:55 -07:00
Code Issues Packages Projects Releases Wiki Activity

lirc: use upstream method to configure and run lirc

Browse Source 
Add helper scripts for lircd and lircd-uinput so that we can
override lirc_options.conf and lircd.conf via files in
/storage/.config

Use separate systemd units for lircd and lircd-uinput, like in
upstream, and just add a ConditionPathExists to enable/disable
the services.

The lirc socket is managed by systemd via lircd.socket, like
in upstream.

Remove udev file for enabling lirc, this is now handled via
systemd only.
This commit is contained in:
Matthias Reichl
2017-04-07 15:27:13 +02:00
parent f0c4995237
commit 97b0d88d39
9 changed files with 72 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
packages/sysutils/lirc/scripts/lircd_helper
View File

@@ -1,61 +1,31 @@
#!/bin/sh
################################################################################
# This file is part of OpenELEC - http://www.openelec.tv
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2017 Matthias Reichl (hias@horus.com)
#
# OpenELEC is free software: you can redistribute it and/or modify
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 2 of the License, or
# (at your option) any later version.
#
# OpenELEC is distributed in the hope that it will be useful,
# LibreELEC is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
# along with LibreELEC. If not, see <http://www.gnu.org/licenses/>.
################################################################################
DEVICE=$(echo "$1" | cut -f1 -d:)
DRIVER=$(echo "$1" | cut -f2 -d:)
CONFIG=$(echo "$1" | cut -f3 -d:)
if [ "x$DRIVER" = "x" ]; then
exit 1;
if [ -e "/storage/.config/lirc_options.conf" ] ; then
LIRCD_OPTIONS="-O /storage/.config/lirc_options.conf"
fi
mkdir -p '/run/lirc'
LIRCD="/usr/sbin/lircd"
LIRCD_UINPUT="/usr/sbin/lircd-uinput"
LIRCD_CONFIG="--driver=$DRIVER --device=/dev/$DEVICE"
LIRCD_CONFIG="$LIRCD_CONFIG --output=/run/lirc/lircd-$DEVICE"
LIRCD_CONFIG="$LIRCD_CONFIG --pidfile=/run/lirc/lircd-$DEVICE.pid"
LIRCD_CONFIG="$LIRCD_CONFIG --release=_LIRCUP"
if [ -e "/storage/.config/lircd.conf" ]; then
LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/lircd.conf"
elif [ -n "$CONFIG" ]; then
if [ -e "/storage/.config/$CONFIG" ]; then
LIRCD_CONFIG="$LIRCD_CONFIG /storage/.config/$CONFIG"
elif [ -e "/etc/lirc/$CONFIG" ]; then
LIRCD_CONFIG="$LIRCD_CONFIG /etc/lirc/$CONFIG"
else
echo "No device specific $CONFIG file found"
echo "You need to provide your own $CONFIG file"
echo "Place it in /storage/.config/$CONFIG"
exit 0
fi
if [ -e "/storage/.config/lircd.conf" ] ; then
LIRCD_CONF="/storage/.config/lircd.conf"
else
echo "No lircd.conf file found"
echo "You need to provide your own lircd.conf file"
echo "Place it in /storage/.config/lircd.conf"
exit 0
LIRCD_CONF="/etc/lirc/lircd.conf"
fi
# lircd daemonizes but lircd-uinput doesn't so we need to fork it to the background
$LIRCD $LIRCD_CONFIG
$LIRCD_UINPUT --release=_LIRCUP /run/lirc/lircd-$DEVICE &
exit 0
exec /usr/sbin/lircd $LIRCD_OPTIONS "$@" $LIRCD_CONF