summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-08-03 16:26:24 +0000
committerRoss Burton <ross@openedhand.com>2007-08-03 16:26:24 +0000
commitd0bcc8d87f2723a1b6e3dd9231f51d9d3bf3d916 (patch)
treed9701654c798019e33433202c8614824bfb65cea
parent1900143c5bd02e780c87c8d1574f3da45350e8b8 (diff)
downloadpoky-d0bcc8d87f2723a1b6e3dd9231f51d9d3bf3d916.tar.gz
Sync hal-git with 0.5.9.1, should work
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2356 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/packages/hal/hal_git.bb15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 976131e85f..63e421efa4 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -5,13 +5,13 @@ LICENSE = "GPL LGPL AFL"
5 5
6DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb" 6DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
7RDEPENDS += "udev hal-info" 7RDEPENDS += "udev hal-info"
8#RDEPENDS_hal-device-manager = "python hal python-pygnome"
9RRECOMMENDS = "udev-utils" 8RRECOMMENDS = "udev-utils"
10 9
11SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ 10SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
11 file://sg-inhibit.patch;patch=1 \
12 file://99_hal" 12 file://99_hal"
13 13
14PV = "0.5.9+git${SRCDATE}" 14PV = "0.5.9.1+git${SRCDATE}"
15PR = "r2" 15PR = "r2"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
@@ -24,7 +24,9 @@ EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
24 --with-hotplug=${sysconfdir}/hotplug.d \ 24 --with-hotplug=${sysconfdir}/hotplug.d \
25 --disable-docbook-docs \ 25 --disable-docbook-docs \
26 --disable-policy-kit \ 26 --disable-policy-kit \
27 --disable-acpi --disable-pmu --disable-pci \ 27 --disable-acpi --disable-acpi-acpid --disable-acpi-proc \
28 --disable-sonypic \
29 --disable-pmu --disable-pci \
28 --disable-pci-ids --disable-pnp-ids \ 30 --disable-pci-ids --disable-pnp-ids \
29 " 31 "
30 32
@@ -64,12 +66,6 @@ pkg_postrm_hal () {
64 delgroup haldaemon || true 66 delgroup haldaemon || true
65} 67}
66 68
67#PACKAGES += "hal-device-manager"
68
69#FILES_hal-device-manager = " \
70# ${datadir}/hal/device-manager/ \
71# ${bindir}/hal-device-manager"
72
73FILES_${PN} = "${sysconfdir} \ 69FILES_${PN} = "${sysconfdir} \
74 ${bindir}/lshal \ 70 ${bindir}/lshal \
75 ${bindir}/hal-find-by-capability \ 71 ${bindir}/hal-find-by-capability \
@@ -79,6 +75,7 @@ FILES_${PN} = "${sysconfdir} \
79 ${bindir}/hal-set-property \ 75 ${bindir}/hal-set-property \
80 ${bindir}/hal-lock \ 76 ${bindir}/hal-lock \
81 ${bindir}/hal-is-caller-locked-out \ 77 ${bindir}/hal-is-caller-locked-out \
78 ${bindir}/hal-disable-polling \
82 ${sbindir} \ 79 ${sbindir} \
83 ${libdir}/libhal.so.* \ 80 ${libdir}/libhal.so.* \
84 ${libdir}/libhal-storage.so.* \ 81 ${libdir}/libhal-storage.so.* \