* [Buildroot] [PATCH 2/2] package/libinput: remove python tools scripts if python is missing
2022-08-09 13:27 [Buildroot] [PATCH 1/2] package/phython-libevdev: new package Romain Naour
@ 2022-08-09 13:27 ` Romain Naour
2022-08-24 10:13 ` [Buildroot] [PATCH 1/2] package/phython-libevdev: new package Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Romain Naour @ 2022-08-09 13:27 UTC (permalink / raw)
To: buildroot; +Cc: Romain Naour, Yann E . MORIN
Some libinput tools are actually python scripts and requires
at least tree python modules: libevdev, pyudev and pyyaml:
libinput]$ file *
libinput-analyze: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-analyze-per-slot-delta: Python script, UTF-8 Unicode text executable
libinput-analyze-recording: Python script, UTF-8 Unicode text executable
libinput-analyze-touch-down-state: Python script, UTF-8 Unicode text executable
libinput-debug-events: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-debug-tablet: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-list-devices: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-measure: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-measure-fuzz: Python script, UTF-8 Unicode text executable
libinput-measure-touchpad-pressure: Python script, UTF-8 Unicode text executable
libinput-measure-touchpad-size: Python script, UTF-8 Unicode text executable
libinput-measure-touchpad-tap: Python script, UTF-8 Unicode text executable
libinput-measure-touch-size: Python script, UTF-8 Unicode text executable
libinput-quirks: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-record: ELF 32-bit LSB pie executable, ARM, EABI5 version 1 (SYSV), dynamically linked, interpreter /lib/ld-uClibc.so.0, stripped
libinput-replay: Python script, UTF-8 Unicode text executable
To avoid adding a python interpreter dependency on libinput package,
add a new libinput option to keep these tools (installed by
default) only when python is available on the target. Otherwise
remove them from the target.
Signed-off-by: Romain Naour <romain.naour@smile.fr>
Cc: Yann E. MORIN <yann.morin.1998@free.fr>
---
libinput install unconditionally python scripts without checking if python is available.
It's not really nice to have to remove them from .mk.
---
package/libinput/Config.in | 22 ++++++++++++++++++++++
package/libinput/libinput.mk | 20 ++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/package/libinput/Config.in b/package/libinput/Config.in
index 14e4e70f96..1a8fcc7ed4 100644
--- a/package/libinput/Config.in
+++ b/package/libinput/Config.in
@@ -13,5 +13,27 @@ config BR2_PACKAGE_LIBINPUT
http://freedesktop.org/wiki/Software/libinput/
+if BR2_PACKAGE_LIBINPUT
+
+config BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS
+ bool "install python tools "
+ depends on BR2_PACKAGE_PYTHON3
+ select BR2_PACKAGE_PYTHON_LIBEVDEV # runtime
+ select BR2_PACKAGE_PYTHON_PYUDEV # runtime
+ select BR2_PACKAGE_PYTHON_PYYAML # runtime
+ help
+ Install python tools:
+ libinput-analyze-per-slot-delta,
+ libinput-analyze-recording,
+ libinput-analyze-touch-down-state,
+ libinput-measure-fuzz,
+ libinput-measure-touchpad-pressure,
+ libinput-measure-touchpad-size,
+ libinput-measure-touchpad-tap,
+ libinput-measure-touch-size,
+ libinput-replay
+
+endif
+
comment "libinput needs udev /dev management"
depends on !BR2_PACKAGE_HAS_UDEV
diff --git a/package/libinput/libinput.mk b/package/libinput/libinput.mk
index a66b0afde5..8c8e0a49a3 100644
--- a/package/libinput/libinput.mk
+++ b/package/libinput/libinput.mk
@@ -30,4 +30,24 @@ else
LIBINPUT_CONF_OPTS += -Ddebug-gui=false
endif
+ifeq ($(BR2_PACKAGE_LIBINPUT_PYTHON_TOOLS),)
+LIBINPUT_PYTHON_TOOLS = libinput-analyze-per-slot-delta \
+ libinput-analyze-recording \
+ libinput-analyze-touch-down-state \
+ libinput-measure-fuzz \
+ libinput-measure-touchpad-pressure \
+ libinput-measure-touchpad-size \
+ libinput-measure-touchpad-tap \
+ libinput-measure-touch-size \
+ libinput-replay
+
+define LIBINPUT_REMOVE_UNNEEDED_FILES
+ for i in $(LIBINPUT_PYTHON_TOOLS) ; do \
+ rm -f $(TARGET_DIR)/usr/libexec/libinput/$$i ; \
+ done
+endef
+
+LIBINPUT_POST_INSTALL_TARGET_HOOKS += LIBINPUT_REMOVE_UNNEEDED_FILES
+endif
+
$(eval $(meson-package))
--
2.34.3
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [Buildroot] [PATCH 1/2] package/phython-libevdev: new package
2022-08-09 13:27 [Buildroot] [PATCH 1/2] package/phython-libevdev: new package Romain Naour
2022-08-09 13:27 ` [Buildroot] [PATCH 2/2] package/libinput: remove python tools scripts if python is missing Romain Naour
@ 2022-08-24 10:13 ` Thomas Petazzoni via buildroot
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni via buildroot @ 2022-08-24 10:13 UTC (permalink / raw)
To: Romain Naour; +Cc: buildroot
On Tue, 9 Aug 2022 15:27:29 +0200
Romain Naour <romain.naour@smile.fr> wrote:
> python-libevdev is needed for libinput replay command:
>
> $ libinput replay recording.yml
> Error: No module named 'libevdev'
> One or more python modules are missing. Please install those modules and re-run this tool.
>
> Indeed only libinput-replay tool is a python script
> (like libinput-analyze-recording, libinput-measure-fuzz...)
>
> phython-libevdev itself requires a kernel built with
> CONFIG_INPUT_UINPUT option enabled, enable this option
> if a kernel is built by Buildroot.
>
> Signed-off-by: Romain Naour <romain.naour@smile.fr>
> ---
> DEVELOPERS | 1 +
> package/Config.in | 1 +
> package/python-libevdev/Config.in | 7 +++++++
> package/python-libevdev/python-libevdev.hash | 5 +++++
> package/python-libevdev/python-libevdev.mk | 20 ++++++++++++++++++++
> 5 files changed, 34 insertions(+)
> create mode 100644 package/python-libevdev/Config.in
> create mode 100644 package/python-libevdev/python-libevdev.hash
> create mode 100644 package/python-libevdev/python-libevdev.mk
So, I have applied both patches, but I had to split things up:
* From PATCH 2/2, I took the removal of the Python tools, made it
unconditional, and applied that to master.
* In next, I cherry-picked the patch from master that unconditionally
removes Python tools of libinput, then applied the python-libevdev
patch, then applied a patch that adds the libinput option for Python
tools.
This way, we have the fix in master (removal of Python tools) and the
new feature in next.
Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 3+ messages in thread