aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--conf/checksums.ini4
-rw-r--r--recipes/hal/hal.inc4
-rw-r--r--recipes/hal/hal_0.5.12.bb11
3 files changed, 18 insertions, 1 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index a35d02a861..2b9d1b96ad 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -10082,6 +10082,10 @@ sha256=b011f194e1ab90e753744405bb5b85949cdda1a02320cb174b8d4a8e5e182dc3
md5=750cf074e88b6fb7012f26d99cd39b9b
sha256=730a9f2340f789677eb0c3b0984bbaca3ede6c12d1e4b16bc7ea91f51d10ba90
+[http://hal.freedesktop.org/releases/hal-0.5.12.tar.gz]
+md5=bb7c36e142437f7363f9a80ae8391926
+sha256=c444e0485e4361eec0e6f06580c45b9fcf6f20a119634a5f0a5c13218cfdfd02
+
[http://freedesktop.org/~david/dist/hal-0.5.2.tar.gz]
md5=3b351822ba359669646026013a3d5a03
sha256=46d0a75f90058909269da4cc42986cd51d5163a6af669e9d7fb4a7d170217d17
diff --git a/recipes/hal/hal.inc b/recipes/hal/hal.inc
index d17907ae79..da24afe25a 100644
--- a/recipes/hal/hal.inc
+++ b/recipes/hal/hal.inc
@@ -9,8 +9,9 @@ S = "${WORKDIR}/hal-${PV}"
inherit autotools pkgconfig
-DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native"
+DEPENDS = "virtual/kernel util-linux-ng dbus-glib udev intltool intltool-native expat libusb gperf-native"
RDEPENDS += "hal-info udev-utils"
+RRECOMMENDS += "eject"
SRC_URI += "file://99_hal \
file://20hal \
@@ -27,6 +28,7 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
--disable-policy-kit \
--disable-pmu \
--disable-pnp-ids \
+ --with-udev-prefix=${sysconfdir} \
${@base_contains('COMBINED_FEATURES', 'pci', '--enable-pci --enable-pci-ids', '--disable-pci --disable-pci-ids',d)} \
${@base_contains('MACHINE_FEATURES', 'acpi', '--enable-acpi', '--disable-acpi',d)} \
"
diff --git a/recipes/hal/hal_0.5.12.bb b/recipes/hal/hal_0.5.12.bb
new file mode 100644
index 0000000000..b6531e8235
--- /dev/null
+++ b/recipes/hal/hal_0.5.12.bb
@@ -0,0 +1,11 @@
+require hal.inc
+
+DEFAULT_PREFERENCE = "-1"
+
+# The following code finds the right linux/input.h,
+# which also works with external-toolchain/SDK
+do_configure() {
+ linux_input_h=`echo "#include <linux/input.h>" | ${CPP} - | \
+ grep "linux\/input.h" | head -n 1 | awk -F '"' '{print $2}'`
+ autotools_do_configure --with-linux-input-header=${linux_input_h}
+}