lirc cleanup: switch to upstream fixes and configuration #1320
Conversation
|
|
|
Without From https://www.gnu.org/software/automake/manual/html_node/Python.html |
HiassofT
force-pushed
the
le-lirc-cleanup
branch
from
b2fcb06
to
6cd2dee
Compare
Use upstream configuration settings where possible and replace downstream patches with upstream fixes. Rename downstream patches to start with 0100
This fixes lircd not picking up devices created after lircd startup See https://sourceforge.net/p/lirc/tickets/279/
Docs are removed after installation so no need to build them
Based on upstream lirc_options.conf with the following changes: - socket set to /run/lirc/lircd.socket, the default clashes with eventlircd - pidfile in /run instead of /var/run - driver set to default - device set to /dev/lirc0
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.
HiassofT
force-pushed
the
le-lirc-cleanup
branch
from
6cd2dee
to
c61ce43
Compare
HiassofT
changed the title
|
I've finished the cleanup and moved compilation and configuration very close to upstream: lircd and lircd-uinput are now standard systemd units, lircd socket is managed by systemd - like in upstream. I've kept the .cache/services/lircd.conf ConditionPathExists so enabling lirc via LE settings works as before, but for proper starting/stopping the services (while LE is running) a LE settings update is needed: HiassofT/service.libreelec.settings@03511b3 Common configuration (driver etc) is now handled via lirc_options.conf, the default in /etc can be overridden via //storage/.config. I've also split the huge combined lircd.conf.* files into separate ones in lircd.conf.d and added a default lircd.conf file which includes all these separate files. I also had to add a few fixes backported from lirc master branch which can be dropped on the next lirc bump. I've reorganized the patch numbering so that the upstream fixes (which can be dropped) start with 0001 whereas our downstream patches start with 0100. |
|
this PR survived 2 weeks of testing in milhouse builds, so I'd say this is good to go now! |
don't merge yet, this is WIP
Discussion with upstream revealed that several crosscompile issues (yaml, poll, uinput) are already fixed in lircd 0.9.4d and we can use upstream configure methods instead of working around these with downstream patches.
I've also added the proposed upstream fixes from https://sourceforge.net/p/lirc/tickets/264/ (lirc-make-devinput picking up host headers and enabling devinput on the target) so we can test them in LE builds.
@lrusak @Kwiboo @jerome-benoit the downstream lircd patches seem to be originating from you, can you please check if everything's still fine?
Also: what's the purpose of lirc-0002-disable-python3.patch? lirc compiled fine without that patch on Debian Jessie and lircd still worked fine on my RPi2 so not quite sure why we are carrying it.