Hi,
Thanks to have applied the patch, but in the meanwhile, hal people have
added two new functions, here is an additional patch.
Also, though ./configure correctly detects that keymaps should only
be generated on linux, tools/Makefile.am still generates a dependency
on them, thus the second attached patch, which will also require a
regeneration of Makefile.in.
Thirdly, PMUs are not implemented on GNU/Hurd, thus the third attached
patch which disables that part of the code (like on other non-Linux
systems actually).
Eventually, since hal-setup-keymap is only generated for linux targets,
the packaging rules should be fixed for non-linux targets, because for
now we end up with:
dh_install -phal
cp: cannot stat `./debian/tmp/usr/bin/hal-setup-keymap': No such file or
directory
Since actually all programs from usr/bin/ get installed, here is a
fourth patch that just installs all of usr/bin/
Samuel
--- hald/dummy/osspec.c.orig 2007-12-15 21:35:28.000000000 +0000
+++ hald/dummy/osspec.c 2007-12-15 21:35:02.000000000 +0000
@@ -37,6 +37,22 @@
#include "../util.h"
#include "../device_info.h"
+HalFileMonitor *
+osspec_get_file_monitor (void)
+{
+ return NULL;
+}
+
+guint
+hal_file_monitor_add_notify (HalFileMonitor *monitor,
+ const char *path,
+ int mask,
+ HalFileMonitorNotifyFunc notify_func,
+ gpointer data)
+{
+ return 0;
+}
+
void
osspec_privileged_init (void)
{
--- /home/youpi/tmp/hal-0.5.10/tools/Makefile.am 2007-10-05
02:13:13.000000000 +0000
+++ Makefile.am 2007-12-15 21:44:38.000000000 +0000
@@ -179,6 +179,8 @@
umount_hal_LDADD = @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la
$(top_builddir)/libhal-storage/libhal-storage.la
endif
+if BUILD_KEYMAPS
+
if HAVE_GPERF
DISTCLEANFILES += \
hal-setup-keymap-hash-name.h \
@@ -191,6 +193,8 @@
hal-setup-keymap-keys.txt
endif
+endif #BUILD_KEYMAPS
+
check:
for f in $(script_SCRIPTS); do \
echo -n "Validate bash syntax in $$f : "; \
--- /home/youpi/tmp/hal-0.5.10/tools/hal-system-power-pmu.c 2007-07-26
18:00:28.000000000 +0000
+++ tools/hal-system-power-pmu.c 2007-12-15 21:50:00.000000000 +0000
@@ -57,6 +57,8 @@
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
+#elif __GNU__
+ return FALSE; /* FIXME implement */
#else
int ret;
int fd;
@@ -92,6 +94,8 @@
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
+#elif __GNU__
+ return FALSE; /* FIXME implement */
#else
int ret;
int fd;
@@ -127,6 +131,8 @@
return FALSE; /* FIXME implement */
#elif sun
return FALSE; /* FIXME implement */
+#elif __GNU__
+ return FALSE; /* FIXME implement */
#else
int ret;
int fd;
--- /home/youpi/tmp/hal-0.5.10/debian/hal.install 2007-12-15
21:38:23.000000000 +0000
+++ hal.install 2007-12-15 21:59:29.000000000 +0000
@@ -1,14 +1,5 @@
debian/tmp/etc/
-debian/tmp/usr/bin/lshal
-debian/tmp/usr/bin/hal-device
-debian/tmp/usr/bin/hal-get-property
-debian/tmp/usr/bin/hal-set-property
-debian/tmp/usr/bin/hal-find-by-capability
-debian/tmp/usr/bin/hal-find-by-property
-debian/tmp/usr/bin/hal-disable-polling
-debian/tmp/usr/bin/hal-is-caller-locked-out
-debian/tmp/usr/bin/hal-lock
-debian/tmp/usr/bin/hal-setup-keymap
+debian/tmp/usr/bin/
debian/tmp/usr/sbin/
debian/tmp/sbin/umount.hal usr/sbin
debian/tmp/usr/lib/hal/
