hal: fix udev dependency

- Selecting symbols with dependencies doesn't work unless you select
  the dependencies as well
- udev-volume-id target gone, use the generic udev one instead

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/hal/Config.in b/package/hal/Config.in
index 56ed42854f38374bfe9c04e1d63c88ccf37e4ef6..623825cd1d20d1c9964d057a7f7997c8c9fa52bc 100644 (file)
--- a/package/hal/Config.in
+++ b/package/hal/Config.in
@@ -3,6 +3,7 @@ config BR2_PACKAGE_HAL
        select BR2_PACKAGE_DBUS
        select BR2_PACKAGE_DBUS_GLIB
        select BR2_PACKAGE_HWDATA
+       select BR2_PACKAGE_UDEV
        select BR2_PACKAGE_UDEV_VOLUME_ID
        help
          The Hardware Abstraction Layer (HAL) suite.

diff --git a/package/hal/hal.mk b/package/hal/hal.mk
index fb152d6a58a7fc695a2494d28e94109aaa684d7d..a72bc63ed66e49d1a38f5858ce402006d1d08749 100644 (file)
--- a/package/hal/hal.mk
+++ b/package/hal/hal.mk
@@ -87,7 +87,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald
        done
        -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal*
 
-hal: host-pkg-config dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY)
+hal: host-pkg-config dbus-glib hwdata udev $(TARGET_DIR)/$(HAL_TARGET_BINARY)
 
 hal-clean:
        rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf