diff options
Diffstat (limited to 'package/hal')
| -rw-r--r-- | package/hal/Config.in | 1 | ||||
| -rw-r--r-- | package/hal/hal-include-fix.patch | 35 | ||||
| -rw-r--r-- | package/hal/hal.mk | 17 | ||||
| -rw-r--r-- | package/hal/hal01-configure-buildroot-cross.patch | 10 |
4 files changed, 45 insertions, 18 deletions
diff --git a/package/hal/Config.in b/package/hal/Config.in index 56ed42854..623825cd1 100644 --- 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-include-fix.patch b/package/hal/hal-include-fix.patch new file mode 100644 index 000000000..af2a7fe59 --- /dev/null +++ b/package/hal/hal-include-fix.patch @@ -0,0 +1,35 @@ +[PATCH] hal: add missing includes + +- hald/linux/classdev.c needs sys/socket.h for struct sockaddr +- hald/linux/addons/addon-storage.c needs limits.h for INT_MAX + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + hald/linux/addons/addon-storage.c | 1 + + hald/linux/classdev.c | 1 + + 2 files changed, 2 insertions(+) + +Index: hal-0.5.8/hald/linux/addons/addon-storage.c +=================================================================== +--- hal-0.5.8.orig/hald/linux/addons/addon-storage.c ++++ hal-0.5.8/hald/linux/addons/addon-storage.c +@@ -29,6 +29,7 @@ + + #include <errno.h> + #include <fcntl.h> ++#include <limits.h> + #include <linux/cdrom.h> + #include <linux/fs.h> + #include <mntent.h> +Index: hal-0.5.8/hald/linux/classdev.c +=================================================================== +--- hal-0.5.8.orig/hald/linux/classdev.c ++++ hal-0.5.8/hald/linux/classdev.c +@@ -31,6 +31,7 @@ + + #include <ctype.h> + #include <limits.h> ++#include <sys/socket.h> + #include <linux/types.h> + #include <net/if_arp.h> /* for ARPHRD_... */ + #include <stdlib.h> diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 07ff04656..754ed85b2 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -12,11 +12,11 @@ HAL_BINARY:=hald/hald HAL_TARGET_BINARY:=usr/sbin/hald GLIB_CFLAGS:=-I$(STAGING_DIR)/usr/include/glib-2.0 \ - -I$(STAGING_DIR)/lib/glib/include -GLIB_LIBS:=$(STAGING_DIR)/lib/libglib-2.0.so \ - $(STAGING_DIR)/lib/libgmodule-2.0.so \ - $(STAGING_DIR)/lib/libgobject-2.0.so \ - $(STAGING_DIR)/lib/libgthread-2.0.so + -I$(STAGING_DIR)/usr/lib/glib-2.0/include +GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libglib-2.0.so \ + $(STAGING_DIR)/usr/lib/libgmodule-2.0.so \ + $(STAGING_DIR)/usr/lib/libgobject-2.0.so \ + $(STAGING_DIR)/usr/lib/libgthread-2.0.so DBUS_GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libdbus-glib-1.so $(DL_DIR)/$(HAL_SOURCE): @@ -29,7 +29,7 @@ $(HAL_DIR)/.unpacked: $(DL_DIR)/$(HAL_SOURCE) toolchain/patch-kernel.sh $(HAL_DIR) package/hal/ \*.patch touch $(HAL_DIR)/.unpacked -$(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config +$(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked (cd $(HAL_DIR); rm -rf config.cache; \ $(TARGET_CONFIGURE_OPTS) \ $(TARGET_CONFIGURE_ARGS) \ @@ -39,7 +39,7 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config DBUS_CFLAGS="-I$(STAGING_DIR)/usr/include/dbus-1.0 -I$(STAGING_DIR)/usr/lib/dbus-1.0/include" \ DBUS_LIBS="$(STAGING_DIR)/usr/lib/libdbus-1.so" \ VOLUME_ID_CFLAGS="$(TARGET_CFLAGS)" \ - VOLUME_ID_LIBS="$(STAGING_DIR)/usr/lib/libvolume_id.so" \ + VOLUME_ID_LIBS="$(STAGING_DIR)/lib/libvolume_id.so" \ ac_cv_path_LIBUSB_CONFIG= \ ./configure $(QUIET) \ --target=$(GNU_TARGET_NAME) \ @@ -49,6 +49,7 @@ $(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config --sysconfdir=/etc \ --localstatedir=/var \ --with-hwdata=$(TARGET_DIR)/usr/share/hwdata \ + --with-expat=$(STAGING_DIR)/usr/ \ --disable-policy-kit \ --disable-gtk-doc \ --disable-static \ @@ -87,7 +88,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald done -$(STRIPCMD) $(STRIP_STRIP_UNNEEDED) $(TARGET_DIR)/usr/lib/libhal* -hal: host-pkgconfig 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 diff --git a/package/hal/hal01-configure-buildroot-cross.patch b/package/hal/hal01-configure-buildroot-cross.patch deleted file mode 100644 index e97a7757e..000000000 --- a/package/hal/hal01-configure-buildroot-cross.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -ur hal-0.5.8/configure hal-0.5.8-patched/configure ---- hal-0.5.8/configure 2006-11-15 12:34:03.000000000 -0600 -+++ hal-0.5.8-patched/configure 2006-11-15 12:33:36.000000000 -0600 -@@ -22014,7 +22014,7 @@ - echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 - echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6 - if test $ac_cv_lib_expat_XML_ParserCreate = yes; then -- EXPAT_LIB="-lexpat" -+ EXPAT_LIB="\$(STAGING_DIR)/lib/libexpat.so" - fi |