Commit af9a0ccb authored by "Steven J. Hill"'s avatar "Steven J. Hill"
Browse files

Add new 'hal' package.

parent 8cc56adc

package/hal/Config.in

0 → 100644
+9 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_HAL

	bool "hal"

	default n

	select BR2_PACKAGE_DBUS

	select BR2_PACKAGE_DBUS_GLIB

	select BR2_PACKAGE_HWDATA

	select BR2_PACKAGE_UDEV_VOLUME_ID

	help

	  The Hardware Abstraction Layer (HAL) suite.

package/hal/hal.mk

0 → 100644
+115 −0
Original line number Diff line number Diff line 
#############################################################

#

# hal

#

#############################################################

HAL_VER:=0.5.8

HAL_SOURCE:=hal-$(HAL_VER).tar.gz

HAL_SITE:=http://people.freedesktop.org/~david/dist/

HAL_DIR:=$(BUILD_DIR)/hal-$(HAL_VER)

HAL_CAT:=$(ZCAT)

HAL_BINARY:=hald/hald

HAL_TARGET_BINARY:=usr/sbin/hald



GLIB_CFLAGS:=-I$(STAGING_DIR)/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

DBUS_GLIB_LIBS:=$(STAGING_DIR)/usr/lib/libdbus-glib-1.so



$(DL_DIR)/$(HAL_SOURCE):

	$(WGET) -P $(DL_DIR) $(HAL_SITE)/$(HAL_SOURCE)



hal-source: $(DL_DIR)/$(HAL_SOURCE)



$(HAL_DIR)/.unpacked: $(DL_DIR)/$(HAL_SOURCE)

	$(HAL_CAT) $(DL_DIR)/$(HAL_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -

	toolchain/patch-kernel.sh $(HAL_DIR) package/hal/ \*.patch

	touch $(HAL_DIR)/.unpacked



$(HAL_DIR)/.configured: $(HAL_DIR)/.unpacked /usr/bin/pkg-config

	(cd $(HAL_DIR); rm -rf config.cache; \

		$(TARGET_CONFIGURE_OPTS) \

		CFLAGS="$(TARGET_CFLAGS) -I$(STAGING_DIR)/lib/glib-2.0/include" \

		LDFLAGS="$(TARGET_LDFLAGS)" \

		GLIB_CFLAGS="$(GLIB_CFLAGS)" \

		GLIB_LIBS="$(GLIB_LIBS)" \

		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" \

		PKG_CONFIG=/usr/bin/pkg-config \

		ac_cv_path_LIBUSB_CONFIG= \

		./configure \

		--target=$(GNU_TARGET_NAME) \

		--host=$(GNU_TARGET_NAME) \

		--build=$(GNU_HOST_NAME) \

		--prefix=/usr \

		--datadir=/usr/share \

		--sysconfdir=/etc \

		--localstatedir=/var \

		--with-hwdata=$(TARGET_DIR)/usr/share/hwdata \

		--disable-policy-kit \

		--disable-gtk-doc \

		--disable-static \

		--disable-acpi-acpid \

		--disable-acpi-proc \

	);

	touch  $(HAL_DIR)/.configured



$(HAL_DIR)/hald/hald: $(HAL_DIR)/.configured

	$(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" DBUS_GLIB_LIBS="$(DBUS_GLIB_LIBS)" -C $(HAL_DIR)



$(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald

	$(MAKE) STAGING_DIR="$(STAGING_DIR)" DESTDIR="$(TARGET_DIR)" -C $(HAL_DIR) install

	rm -rf $(TARGET_DIR)/usr/share/locale

	rm -rf $(TARGET_DIR)/usr/share/doc

	rm -rf $(TARGET_DIR)/usr/share/gtk-doc

	rm -rf $(TARGET_DIR)/usr/share/hal/device-manager

	rm -rf $(TARGET_DIR)/usr/lib/pkgconfig

	rm -rf $(TARGET_DIR)/usr/include

	rm -rf $(TARGET_DIR)/usr/lib/libhal*.so

	rm -rf $(TARGET_DIR)/usr/lib/libhal*.la

	rm -rf $(TARGET_DIR)/usr/lib/hal

	rm -rf $(TARGET_DIR)/etc/PolicyKit

	$(INSTALL) -m 0755 -D package/hal/init-hal $(TARGET_DIR)/etc/init.d/S98haldaemon

	rm -rf $(TARGET_DIR)/etc/rc.d

	for file in hald-addon-acpi* hald-addon-cpufreq		\

		    hald-addon-keyboard hald-addon-pmu		\

		    hald-probe-pc-floppy hald-probe-printer	\

		    hald-probe-serial hald-probe-smbios		\

		    hal-storage-eject hal-storage-closetray	\

		    hal-system-power-pmu hald-probe-input	\

		    hald-probe-hiddev hald-addon-hid-ups; do	\

		rm -f $(TARGET_DIR)/usr/libexec/$$file;		\

	done

	-$(STRIP) --strip-unneeded $(TARGET_DIR)/usr/lib/libhal*



hal: uclibc dbus-glib hwdata udev-volume_id $(TARGET_DIR)/$(HAL_TARGET_BINARY)



hal-clean:

	rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf

	rm -rf $(TARGET_DIR)/etc/hal $(TARGET_DIR)/usr/share/hal

	rm -f $(TARGET_DIR)/etc/init.d/S98haldaemon

	rm -f $(TARGET_DIR)/etc/udev/rules.d/90-hal.rules

	rm -f $(TARGET_DIR)/usr/bin/hal-* $(TARGET_DIR)/usr/bin/lshal

	rm -f $(TARGET_DIR)/usr/sbin/hald

	rm -f $(TARGET_DIR)/usr/libexec/hald-* $(TARGET_DIR)/usr/libexec/hal-*

	rmdir -p --ignore-fail-on-non-empty $(TARGET_DIR)/usr/libexec

	rm -f $(TARGET_DIR)/usr/lib/libhal.so.1*

	rm -f $(TARGET_DIR)/usr/lib/libhal-storage.so.1*

	-$(MAKE) -C $(HAL_DIR) clean



hal-dirclean:

	rm -rf $(HAL_DIR)



#############################################################

#

# Toplevel Makefile options

#

#############################################################

ifeq ($(strip $(BR2_PACKAGE_HAL)),y)

TARGETS+=hal

endif

package/hal/hal01-configure-buildroot-cross.patch

0 → 100644
+10 −0
Original line number Diff line number Diff line 
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

package/hal/hal02-include-ieee80211-fix.patch

0 → 100644
+15 −0
Original line number Diff line number Diff line 
diff -ur hal-0.5.8/hald/linux/classdev.c hal-0.5.8-patched/hald/linux/classdev.c

--- hal-0.5.8/hald/linux/classdev.c	2006-09-11 18:32:56.000000000 -0500

+++ hal-0.5.8-patched/hald/linux/classdev.c	2007-01-13 22:00:46.896769548 -0600

@@ -32,7 +32,10 @@

 #include <ctype.h>

 #include <limits.h>

 #include <linux/types.h>

-#include <net/if_arp.h> /* for ARPHRD_... */

+#include <linux/if_arp.h> /* for ARPHRD_... */

+#ifndef ARPHRD_IEEE80211_RADIOTAP

+# define ARPHRD_IEEE80211_RADIOTAP 803

+#endif

 #include <stdlib.h>

 #include <string.h>

 #include <stdint.h>

package/hal/hal03-link-dbus.patch

0 → 100644
+60 −0
Original line number Diff line number Diff line 
diff -urN hal-0.5.8/hald/linux/addons/Makefile.in hal-0.5.8-patched/hald/linux/addons/Makefile.in

--- hal-0.5.8/hald/linux/addons/Makefile.in	2006-09-11 18:25:31.000000000 -0500

+++ hal-0.5.8-patched/hald/linux/addons/Makefile.in	2006-11-16 10:08:30.000000000 -0600

@@ -119,7 +119,7 @@

 	$(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -o $@

 SOURCES = $(hald_addon_acpi_SOURCES) \

 	$(hald_addon_acpi_buttons_toshiba_SOURCES) \

 	$(hald_addon_cpufreq_SOURCES) $(hald_addon_hid_ups_SOURCES) \

diff -urN hal-0.5.8/hald/linux/probing/Makefile.in hal-0.5.8-patched/hald/linux/probing/Makefile.in

--- hal-0.5.8/hald/linux/probing/Makefile.in	2006-09-11 18:25:31.000000000 -0500

+++ hal-0.5.8-patched/hald/linux/probing/Makefile.in	2006-11-16 10:08:30.000000000 -0600

@@ -97,7 +97,7 @@

 	$(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_LIBS) -o $@

 SOURCES = $(hald_probe_hiddev_SOURCES) $(hald_probe_input_SOURCES) \

 	$(hald_probe_pc_floppy_SOURCES) $(hald_probe_printer_SOURCES) \

 	$(hald_probe_serial_SOURCES) $(hald_probe_smbios_SOURCES) \

diff -urN hal-0.5.8/hald/Makefile.in hal-0.5.8-patched/hald/Makefile.in

--- hal-0.5.8/hald/Makefile.in	2006-09-11 18:25:30.000000000 -0500

+++ hal-0.5.8-patched/hald/Makefile.in	2006-11-16 10:08:30.000000000 -0600

@@ -71,7 +71,7 @@

 	$(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_GLIB_LIBS) $(GLIB_LIBS) -o $@

 SOURCES = $(hald_SOURCES)

 DIST_SOURCES = $(hald_SOURCES)

 RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \

diff -urN hal-0.5.8/hald-runner/Makefile.in hal-0.5.8-patched/hald-runner/Makefile.in

--- hal-0.5.8/hald-runner/Makefile.in	2006-09-11 18:25:30.000000000 -0500

+++ hal-0.5.8-patched/hald-runner/Makefile.in	2006-11-16 10:09:06.000000000 -0600

@@ -64,7 +64,7 @@

 	$(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+	$(AM_LDFLAGS) $(LDFLAGS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -o $@

 SOURCES = $(hald_runner_SOURCES)

 DIST_SOURCES = $(hald_runner_SOURCES)

 ETAGS = etags

diff -urN hal-0.5.8/tools/Makefile.in hal-0.5.8-patched/tools/Makefile.in

--- hal-0.5.8/tools/Makefile.in	2006-09-11 18:25:33.000000000 -0500

+++ hal-0.5.8-patched/tools/Makefile.in	2006-11-16 10:10:14.000000000 -0600

@@ -133,7 +133,7 @@

 	$(AM_CFLAGS) $(CFLAGS)

 CCLD = $(CC)

 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \

-	$(AM_LDFLAGS) $(LDFLAGS) -o $@

+	$(AM_LDFLAGS) $(LDFLAGS) $(DBUS_LIBS) $(GLIB_LIBS) $(DBUS_GLIB_LIBS) -o $@

 SOURCES = $(hal_device_SOURCES) $(hal_find_by_capability_SOURCES) \

 	$(hal_find_by_property_SOURCES) $(hal_get_property_SOURCES) \

 	$(hal_set_property_SOURCES) \