But make it configurable. Signed-off-by: Aleksander Morgado <aleksan...@lanedo.com> --- utils/systemd-udev/Config.in | 6 ++++++ utils/systemd-udev/Makefile | 18 +++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/utils/systemd-udev/Config.in b/utils/systemd-udev/Config.in index 97a89be..dcc2908 100644 --- a/utils/systemd-udev/Config.in +++ b/utils/systemd-udev/Config.in @@ -3,6 +3,12 @@ menu "Configuration" depends on PACKAGE_systemd-udev +config SYSTEMD_UDEV_DISABLE_GUDEV + bool "Disable libgudev" + default n + help + Disable compilation of libgudev + config SYSTEMD_UDEV_EXTRA_ata_id bool "Install udev ata_id callout" default y diff --git a/utils/systemd-udev/Makefile b/utils/systemd-udev/Makefile index ffdbe61..86ff59d 100644 --- a/utils/systemd-udev/Makefile +++ b/utils/systemd-udev/Makefile @@ -27,7 +27,7 @@ define Package/systemd-udev TITLE:=Dynamic device management subsystem URL:=http://www.freedesktop.org/wiki/Software/systemd/ MENU:=1 - DEPENDS:=+librt +dbus +libcap + DEPENDS:=+librt +dbus +libcap +glib2 endef define Package/systemd-udev/description @@ -43,6 +43,9 @@ define Package/systemd-udev/config source "$(SOURCE)/Config.in" endef +# gudev args +udev-args-$(CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV) += --disable-gudev + CONFIGURE_ARGS += \ --prefix=/usr \ --sysconfdir=/etc \ @@ -76,9 +79,9 @@ CONFIGURE_ARGS += \ --disable-localed \ --disable-coredump \ --disable-myhostname \ - --disable-gudev \ --disable-keymap \ - --disable-manpages + --disable-manpages \ + $(udev-args-y) # ata_id callout systemd-udev-extra-lib-bin-$(CONFIG_SYSTEMD_UDEV_EXTRA_ata_id) += ata_id @@ -110,8 +113,6 @@ udev-extra-rules-$(CONFIG_SYSTEMD_UDEV_EXTRA_qemu) += 42-usb-hid-pm.rules # TODO: keymap -# TODO: libgudev - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/libudev.h $(1)/usr/include @@ -123,6 +124,10 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libudev.pc $(1)/usr/lib/pkgconfig $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libsystemd-daemon.pc $(1)/usr/lib/pkgconfig +ifneq ($(CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV),y) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgudev-1.0.so* $(1)/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gudev-1.0.pc $(1)/usr/lib/pkgconfig +endif endef define Package/systemd-udev/install @@ -158,6 +163,9 @@ define Package/systemd-udev/install $(INSTALL_DIR) $(1)/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libudev.so* $(1)/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsystemd-daemon.so* $(1)/lib +ifneq ($(CONFIG_SYSTEMD_UDEV_DISABLE_GUDEV),y) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgudev-1.0.so* $(1)/lib +endif $(INSTALL_DIR) $(1)/lib/udev ifneq ($(systemd-udev-extra-lib-bin-y),) -- 1.8.1.2 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel