summaryrefslogtreecommitdiffstats
path: root/meta/packages/hal
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-06-12 15:50:01 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-06-12 15:50:01 +0100
commite7be8af15129caa0c79def705ceb2b87bd9caaa3 (patch)
treec2af8236aacf0fc660b230c0c5a1d8f6a7c4f211 /meta/packages/hal
parentd0c00fd14b2ea038e0e49402ce3c0e33c3d05398 (diff)
downloadpoky-e7be8af15129caa0c79def705ceb2b87bd9caaa3.tar.gz
hal: Use autotools_stage_all
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/hal')
-rw-r--r--meta/packages/hal/hal.inc11
-rw-r--r--meta/packages/hal/hal_0.5.11+0.5.12rc1.bb2
-rw-r--r--meta/packages/hal/hal_git.bb9
3 files changed, 3 insertions, 19 deletions
diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc
index d0c74e84af..8c5389fe8f 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/packages/hal/hal.inc
@@ -7,7 +7,7 @@ SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz"
7 7
8S = "${WORKDIR}/hal-${PV}" 8S = "${WORKDIR}/hal-${PV}"
9 9
10inherit autotools pkgconfig 10inherit autotools_stage pkgconfig
11 11
12DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native" 12DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native"
13RDEPENDS += "udev hal-info" 13RDEPENDS += "udev hal-info"
@@ -43,15 +43,6 @@ do_install_append() {
43 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d 43 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
44} 44}
45 45
46do_stage() {
47 oe_libinstall -C libhal -a -so libhal ${STAGING_LIBDIR}
48 oe_libinstall -C libhal-storage -a -so libhal-storage ${STAGING_LIBDIR}
49
50 install -d ${STAGING_INCDIR}/hal
51 install -m 0644 libhal/libhal.h ${STAGING_INCDIR}/hal
52 install -m 0644 libhal-storage/libhal-storage.h ${STAGING_INCDIR}/hal
53}
54
55# At the time the postinst runs, dbus might not be setup so only restart if running 46# At the time the postinst runs, dbus might not be setup so only restart if running
56pkg_postinst_hal () { 47pkg_postinst_hal () {
57 # can't do this offline 48 # can't do this offline
diff --git a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb b/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
index 1d4ca592ae..f9b4f2cb7d 100644
--- a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
+++ b/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
@@ -1,6 +1,6 @@
1require hal.inc 1require hal.inc
2 2
3PR = "r1" 3PR = "r2"
4 4
5SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.gz \ 5SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.gz \
6 file://99_hal \ 6 file://99_hal \
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 44be44f980..1238094914 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -16,7 +16,7 @@ PR = "r4"
16 16
17S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
18 18
19inherit autotools pkgconfig 19inherit autotools_stage pkgconfig
20 20
21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \ 21EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
22 --with-expat=${STAGING_DIR_HOST}${layout_prefix} \ 22 --with-expat=${STAGING_DIR_HOST}${layout_prefix} \
@@ -37,13 +37,6 @@ do_install_append() {
37 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d 37 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
38} 38}
39 39
40do_stage() {
41 autotools_stage_all
42 install -d ${STAGING_LIBDIR}
43 install -m 755 libhal/.libs/libhal.so.1.0.0 ${STAGING_LIBDIR}/libhal.so
44 install -m 755 libhal-storage/.libs/libhal-storage.so.1.0.0 ${STAGING_LIBDIR}/libhal-storage.so
45}
46
47# At the time the postinst runs, dbus might not be setup so only restart if running 40# At the time the postinst runs, dbus might not be setup so only restart if running
48pkg_postinst_hal () { 41pkg_postinst_hal () {
49 # can't do this offline 42 # can't do this offline