mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-07-27 07:57:27 +00:00
libgpiod: minimize intra-recipe dependencies for ptest
Make the packaging a bit more fine-grained. Create separate packages for the libgpiosim library and gpio-manager configuration files. Make the ptest package run-time depend on only the gpio-manager config. This way, we don't pull the entire daemon infrastructure if all we want is to run its test suite. While at it: add GPIO udev rules to the gpio-manager config package. Currently they are in the main libgpiod package where they don't really belong. Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@linaro.org> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
committed by
Khem Raj
parent
f3d301643e
commit
0718d6e84d
@@ -20,27 +20,30 @@ PACKAGECONFIG[tests] = " \
|
|||||||
--enable-tests --enable-tools --enable-bindings-cxx --enable-bindings-glib --enable-gpioset-interactive --enable-dbus, \
|
--enable-tests --enable-tools --enable-bindings-cxx --enable-bindings-glib --enable-gpioset-interactive --enable-dbus, \
|
||||||
--disable-tests, \
|
--disable-tests, \
|
||||||
kmod util-linux glib-2.0 catch2 libedit glib-2.0-native libgudev, \
|
kmod util-linux glib-2.0 catch2 libedit glib-2.0-native libgudev, \
|
||||||
bash dbus glib-2.0-utils libgpiod-manager shunit2 \
|
bash dbus glib-2.0-utils libgpiod-manager-cfg shunit2 \
|
||||||
"
|
"
|
||||||
PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
|
PACKAGECONFIG[gpioset-interactive] = "--enable-gpioset-interactive,--disable-gpioset-interactive,libedit"
|
||||||
PACKAGECONFIG[glib] = "--enable-bindings-glib,--disable-bindings-glib,glib-2.0 glib-2.0-native"
|
PACKAGECONFIG[glib] = "--enable-bindings-glib,--disable-bindings-glib,glib-2.0 glib-2.0-native"
|
||||||
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,glib-2.0 glib-2.0-native libgudev,dbus"
|
PACKAGECONFIG[dbus] = "--enable-dbus,--disable-dbus,glib-2.0 glib-2.0-native libgudev,dbus"
|
||||||
|
|
||||||
PACKAGES =+ "${PN}-ptest-dev ${PN}-glib ${PN}-manager ${PN}-cli"
|
PACKAGES =+ "${PN}-gpiosim ${PN}-glib ${PN}-manager ${PN}-manager-cfg ${PN}-cli"
|
||||||
FILES:${PN}-tools += "${bindir}/gpionotify"
|
FILES:${PN}-tools += "${bindir}/gpionotify"
|
||||||
FILES:${PN}-ptest += "${libdir}/libgpiosim.so.*"
|
FILES:${PN}-gpiosim += "${libdir}/libgpiosim.so.*"
|
||||||
FILES:${PN}-ptest-dev += "${includedir}/gpiosim.h"
|
FILES:${PN}-gpiosim-dev += "${includedir}/gpiosim.h"
|
||||||
FILES:${PN}-glib += "${libdir}/libgpiod-glib.so.*"
|
FILES:${PN}-glib += "${libdir}/libgpiod-glib.so.*"
|
||||||
FILES:${PN}-manager += " \
|
FILES:${PN}-manager += " \
|
||||||
${bindir}/gpio-manager \
|
${bindir}/gpio-manager \
|
||||||
${sysconfdir}/dbus-1/system.d/io.gpiod1.conf \
|
|
||||||
${datadir}/dbus-1/interfaces/io.gpiod1.xml \
|
|
||||||
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/gpio-manager.service', '', d)} \
|
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_system_unitdir}/gpio-manager.service', '', d)} \
|
||||||
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${sysconfdir}/init.d/gpio-manager', '', d)} \
|
${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', '${sysconfdir}/init.d/gpio-manager', '', d)} \
|
||||||
"
|
"
|
||||||
|
FILES:${PN}-manager-cfg += " \
|
||||||
|
${sysconfdir}/dbus-1/system.d/io.gpiod1.conf \
|
||||||
|
${datadir}/dbus-1/interfaces/io.gpiod1.xml \
|
||||||
|
${nonarch_base_libdir}/udev/rules.d/90-gpio.rules \
|
||||||
|
"
|
||||||
FILES:${PN}-cli += "${bindir}/gpiocli"
|
FILES:${PN}-cli += "${bindir}/gpiocli"
|
||||||
|
|
||||||
RDEPENDS:${PN}-manager += "dbus"
|
RDEPENDS:${PN}-manager += "dbus ${PN}-manager-cfg"
|
||||||
RDEPENDS:${PN}-cli += "${PN}-manager"
|
RDEPENDS:${PN}-cli += "${PN}-manager"
|
||||||
|
|
||||||
SYSTEMD_PACKAGES = "${PN}-manager"
|
SYSTEMD_PACKAGES = "${PN}-manager"
|
||||||
@@ -74,7 +77,7 @@ USERADD_PARAM:${PN}-manager = "--system -M -s /bin/nologin -g gpio gpio-manager"
|
|||||||
RDEPENDS:${PN}-ptest += " \
|
RDEPENDS:${PN}-ptest += " \
|
||||||
${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
|
${@bb.utils.contains('PTEST_ENABLED', '1', 'shunit2 bash', '', d)} \
|
||||||
"
|
"
|
||||||
RRECOMMENDS:${PN}-ptest += "kernel-module-gpio-sim kernel-module-configfs"
|
RRECOMMENDS:${PN}-gpiosim += "kernel-module-gpio-sim kernel-module-configfs"
|
||||||
INSANE_SKIP:${PN}-ptest += "buildpaths"
|
INSANE_SKIP:${PN}-ptest += "buildpaths"
|
||||||
|
|
||||||
do_compile:prepend() {
|
do_compile:prepend() {
|
||||||
|
|||||||
Reference in New Issue
Block a user