rules: use external libgudev if systemd is used

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

11 files changed, 14 insertions, 9 deletions

diff --git a/rules/devicekit-disks.in b/rules/devicekit-disks.in
index b684c2bee..5b0967e63 100644
--- a/rules/devicekit-disks.in
+++ b/rules/devicekit-disks.in
@@ -15,7 +15,7 @@ menuconfig DEVICEKIT_DISKS
 	select POLKIT
 	select UDEV
 	select UDEV_LIBUDEV
-	select UDEV_LIBGUDEV
+	select LIBGUDEV
 	# busybox mount can't handle all the options
 	depends on !BUSYBOX_MOUNT || ALLYES
 	depends on !BUSYBOX_UMOUNT || ALLYES
diff --git a/rules/gst-plugins-base.in b/rules/gst-plugins-base.in
index b2e1a367a..d7dcfa2fd 100644
--- a/rules/gst-plugins-base.in
+++ b/rules/gst-plugins-base.in
@@ -16,7 +16,7 @@ menuconfig GST_PLUGINS_BASE
 	select LIBVORBIS	if GST_PLUGINS_BASE_VORBIS
 	select PANGO		if GST_PLUGINS_BASE_PANGO
 	select UDEV		if GST_PLUGINS_BASE_GST_V4L
-	select UDEV_LIBGUDEV	if GST_PLUGINS_BASE_GST_V4L
+	select LIBGUDEV		if GST_PLUGINS_BASE_GST_V4L
 	select LIBXML2		if GST_PLUGINS_BASE_SUBPARSE
 	select LIBXML2_HTML	if GST_PLUGINS_BASE_SUBPARSE
 	select ORC		if GST_PLUGINS_BASE_ORC
diff --git a/rules/gst-plugins-good.in b/rules/gst-plugins-good.in
index c8e43555e..ba6c6df65 100644
--- a/rules/gst-plugins-good.in
+++ b/rules/gst-plugins-good.in
@@ -19,7 +19,7 @@ menuconfig GST_PLUGINS_GOOD
 	select FLAC			if GST_PLUGINS_GOOD_FLAC
 	select CAIRO			if GST_PLUGINS_GOOD_CAIRO
 	select UDEV			if GST_PLUGINS_GOOD_GST_V4L2
-	select UDEV_LIBGUDEV		if GST_PLUGINS_GOOD_GST_V4L2
+	select LIBGUDEV			if GST_PLUGINS_GOOD_GST_V4L2
 	select V4L_UTILS		if GST_PLUGINS_GOOD_GST_V4L2_LIBV4L2
 	select V4L_UTILS_LIBV4L2	if GST_PLUGINS_GOOD_GST_V4L2_LIBV4L2
 	select ORC			if GST_PLUGINS_GOOD_ORC
diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in
index 483a26a70..5c86d77c8 100644
--- a/rules/gst-plugins-good1.in
+++ b/rules/gst-plugins-good1.in
@@ -18,7 +18,7 @@ menuconfig GST_PLUGINS_GOOD1
 	select FLAC			if GST_PLUGINS_GOOD1_FLAC
 	select CAIRO			if GST_PLUGINS_GOOD1_CAIRO
 	select UDEV			if GST_PLUGINS_GOOD1_GST_V4L2
-	select UDEV_LIBGUDEV		if GST_PLUGINS_GOOD1_GST_V4L2
+	select LIBGUDEV			if GST_PLUGINS_GOOD1_GST_V4L2
 	select V4L_UTILS		if GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2
 	select V4L_UTILS_LIBV4L2	if GST_PLUGINS_GOOD1_GST_V4L2_LIBV4L2
 	select ORC			if GST_PLUGINS_GOOD1_ORC
diff --git a/rules/libgudev.in b/rules/libgudev.in
index 3afec5bac..90b02ef32 100644
--- a/rules/libgudev.in
+++ b/rules/libgudev.in
@@ -5,6 +5,7 @@ config LIBGUDEV
 	select GLIB
 	select UDEV
 	select UDEV_LIBUDEV
+	select UDEV_LIBGUDEV	if !SYSTEMD
 	prompt "libgudev"
 	help
 	  GObject-based wrapper library for libudev
diff --git a/rules/libgudev.make b/rules/libgudev.make
index 67de82ec5..1f71bc5ac 100644
--- a/rules/libgudev.make
+++ b/rules/libgudev.make
@@ -16,6 +16,7 @@ PACKAGES-$(PTXCONF_LIBGUDEV) += libgudev
 #
 # Paths and names
 #
+ifdef PTXCONF_SYSTEMD
 LIBGUDEV_VERSION	:= 230
 LIBGUDEV_MD5		:= e4dee8f3f349e9372213d33887819a4d
 LIBGUDEV		:= libgudev-$(LIBGUDEV_VERSION)
@@ -39,7 +40,7 @@ LIBGUDEV_CONF_OPT	:= \
 	--disable-gtk-doc-html \
 	--disable-gtk-doc-pdf \
 	--disable-introspection
-
+endif
 
 # ----------------------------------------------------------------------------
 # Target-Install
@@ -48,6 +49,7 @@ LIBGUDEV_CONF_OPT	:= \
 $(STATEDIR)/libgudev.targetinstall:
 	@$(call targetinfo)
 
+ifdef PTXCONF_SYSTEMD
 	@$(call install_init, libgudev)
 	@$(call install_fixup, libgudev,PRIORITY,optional)
 	@$(call install_fixup, libgudev,SECTION,base)
@@ -57,6 +59,7 @@ $(STATEDIR)/libgudev.targetinstall:
 	@$(call install_lib, libgudev, 0, 0, 0644, libgudev-1.0)
 
 	@$(call install_finish, libgudev)
+endif
 
 	@$(call touch)
 
diff --git a/rules/libmbim.in b/rules/libmbim.in
index f058c0fce..cf15bf13d 100644
--- a/rules/libmbim.in
+++ b/rules/libmbim.in
@@ -4,7 +4,7 @@ config LIBMBIM
 	tristate
 	select GLIB
 	select UDEV
-	select UDEV_LIBGUDEV
+	select LIBGUDEV
 	prompt "libmbim"
 	help
 	  libmbim is a glib-based library for talking to WWAN modems and
diff --git a/rules/modemmanager.in b/rules/modemmanager.in
index d6c412ed2..50f2d9c6a 100644
--- a/rules/modemmanager.in
+++ b/rules/modemmanager.in
@@ -4,7 +4,7 @@ menuconfig MODEMMANAGER
 	tristate
 	select GLIB
 	select UDEV
-	select UDEV_LIBGUDEV
+	select LIBGUDEV
 	select LIBMBIM
 	select LIBQMI
 	prompt "modemmanager                  "
diff --git a/rules/networkmanager.in b/rules/networkmanager.in
index 6385d9b9b..b4af2b27f 100644
--- a/rules/networkmanager.in
+++ b/rules/networkmanager.in
@@ -17,7 +17,7 @@ menuconfig NETWORKMANAGER
 	select HOST_INTLTOOL		# why? NLS is disabled!!!
 	select LIBNDP
 	select UDEV			if RUNTIME
-	select UDEV_LIBGUDEV
+	select LIBGUDEV
 	select MODEMMANAGER		if NETWORKMANAGER_WWAN
 	select WPA_SUPPLICANT		if NETWORKMANAGER_WIRELESS && RUNTIME
 	select WPA_SUPPLICANT_CTRL_IFACE_DBUS if NETWORKMANAGER_WIRELESS && RUNTIME
diff --git a/rules/udev.in b/rules/udev.in
index 0c1a8a22f..fc526c4f9 100644
--- a/rules/udev.in
+++ b/rules/udev.in
@@ -112,6 +112,7 @@ config UDEV_LIBUDEV
 
 config UDEV_LIBGUDEV
 	bool
+	depends on !SYSTEMD
 	select UDEV_LIBUDEV
 	prompt "install libgudev"
 	help
diff --git a/rules/udisks.in b/rules/udisks.in
index 39b8eddf5..52ac675f5 100644
--- a/rules/udisks.in
+++ b/rules/udisks.in
@@ -16,7 +16,7 @@ menuconfig UDISKS
 	select POLKIT
 	select UDEV
 	select UDEV_LIBUDEV
-	select UDEV_LIBGUDEV
+	select LIBGUDEV
 	# busybox mount can't handle all the options
 	depends on !BUSYBOX_MOUNT || ALLYES
 	depends on !BUSYBOX_UMOUNT || ALLYES