summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQing He <qing.he@intel.com>2010-07-20 10:35:15 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-23 23:53:30 +0100
commit8bad27517486ff69b961a03f5d25a9c5aa5a2b7e (patch)
tree9fd78296c8ac858c01afa05e0f693cbf33bd416e
parent63d56523555b000a4b52027b68d0e7f33bf6a2ec (diff)
downloadpoky-8bad27517486ff69b961a03f5d25a9c5aa5a2b7e.tar.gz
hal: upgrade to version 0.5.14
from 0.5.13 changes: - udev rules dir has been changing to /lib/udev/rules.d in udev upstream, add an override to stay in /etc/rules.d for compatibility - consolidate hal.inc and hal_git.bb, hal_git.bb is used as a reference thus should have a negative preference - change preferred version of hal to 0.5.14 - remove hal_0.5.11+0.5.12rc1 - remove RRECOMMENDS on udev-utils, the package is to be removed Signed-off-by: Qing He <qing.he@intel.com>
-rw-r--r--meta/conf/distro/include/poky-fixed-revisions.inc2
-rw-r--r--meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff22
-rw-r--r--meta/packages/hal/hal.inc13
-rw-r--r--meta/packages/hal/hal_0.5.13.bb21
-rw-r--r--meta/packages/hal/hal_0.5.14.bb (renamed from meta/packages/hal/hal_0.5.11+0.5.12rc1.bb)9
-rw-r--r--meta/packages/hal/hal_git.bb76
6 files changed, 11 insertions, 132 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc
index f7e64d7b22..630427059a 100644
--- a/meta/conf/distro/include/poky-fixed-revisions.inc
+++ b/meta/conf/distro/include/poky-fixed-revisions.inc
@@ -24,7 +24,7 @@ PREFERRED_VERSION_evince ?= "2.20.0"
24PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" 24PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}"
25PREFERRED_VERSION_oprofile ?= "0.9.6" 25PREFERRED_VERSION_oprofile ?= "0.9.6"
26PREFERRED_VERSION_elfutils ?= "0.89" 26PREFERRED_VERSION_elfutils ?= "0.89"
27PREFERRED_VERSION_hal ?= "0.5.13" 27PREFERRED_VERSION_hal ?= "0.5.14"
28PREFERRED_VERSION_hal-info ?= "20090414" 28PREFERRED_VERSION_hal-info ?= "20090414"
29PREFERRED_VERSION_udev ?= "141" 29PREFERRED_VERSION_udev ?= "141"
30 30
diff --git a/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff b/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
deleted file mode 100644
index 7d9d42d69f..0000000000
--- a/meta/packages/hal/hal-0.5.11+0.5.12rc1/fix-configure.diff
+++ /dev/null
@@ -1,22 +0,0 @@
1From: Rémi Cardona <remi@gentoo.org>
2Date: Sat, 9 Aug 2008 15:04:07 +0000 (+0200)
3Subject: add libtool-2.2 support
4X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=c8a1aedf87bbb200fc5daa0ec8559a2d84fbb61d
5
6add libtool-2.2 support
7
8Fix for aclocal to work properly with libtool 2.2 which no longer
9checks for C++ automatically (this patch is of course backwards
10compatible with libtool 1.5.x)
11---
12
13--- a/configure.in
14+++ b/configure.in
15@@ -29,6 +29,7 @@ AC_SUBST(LT_AGE)
16
17 AC_ISC_POSIX
18 AC_PROG_CC
19+AC_PROG_CXX
20 AM_PROG_CC_C_O
21 AC_HEADER_STDC
22 AC_PROG_LIBTOOL
diff --git a/meta/packages/hal/hal.inc b/meta/packages/hal/hal.inc
index 2b70eb714d..cacc67bd16 100644
--- a/meta/packages/hal/hal.inc
+++ b/meta/packages/hal/hal.inc
@@ -4,17 +4,14 @@ BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
4SECTION = "unknown" 4SECTION = "unknown"
5 5
6LICENSE = "GPLv2+ | AFL" 6LICENSE = "GPLv2+ | AFL"
7LIC_FILES_CHKSUM = "file://COPYING;md5=5b5ffd59fbb7c2fff6de76c94177af31"
7 8
8DEPENDS = "virtual/kernel dbus-glib udev intltool intltool-native expat libusb gperf-native" 9DEPENDS = "virtual/kernel dbus-glib udev util-linux intltool intltool-native expat libusb gperf-native"
9RDEPENDS += "udev hal-info" 10RDEPENDS += "udev hal-info"
10RRECOMMENDS = "udev-utils"
11 11
12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz" 12SRC_URI = "http://hal.freedesktop.org/releases/hal-${PV}.tar.gz \
13SRC_URI += "file://99_hal \ 13 file://99_hal \
14 file://20hal \ 14 file://20hal"
15 "
16
17S = "${WORKDIR}/hal-${PV}"
18 15
19inherit autotools pkgconfig 16inherit autotools pkgconfig
20 17
diff --git a/meta/packages/hal/hal_0.5.13.bb b/meta/packages/hal/hal_0.5.13.bb
deleted file mode 100644
index dde33fabbf..0000000000
--- a/meta/packages/hal/hal_0.5.13.bb
+++ /dev/null
@@ -1,21 +0,0 @@
1require hal.inc
2
3PR = "r3"
4
5SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.13.tar.gz \
6 file://99_hal \
7 file://20hal"
8
9S = "${WORKDIR}/hal-0.5.13"
10
11EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
12
13PACKAGES =+ "libhal libhal-storage"
14
15DEPENDS += "util-linux"
16
17FILES_libhal = "${libdir}/libhal.so.*"
18FILES_libhal-storage = "${libdir}/libhal-storage.so.*"
19
20FILES_${PN} =+ "${bindir}/hal-disable-polling \
21 ${bindir}/hal-setup-keymap"
diff --git a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb b/meta/packages/hal/hal_0.5.14.bb
index f9b4f2cb7d..4981c84c49 100644
--- a/meta/packages/hal/hal_0.5.11+0.5.12rc1.bb
+++ b/meta/packages/hal/hal_0.5.14.bb
@@ -1,14 +1,9 @@
1require hal.inc 1require hal.inc
2 2
3PR = "r2" 3PR = "r0"
4
5SRC_URI = "http://hal.freedesktop.org/releases/hal-0.5.12rc1.tar.gz \
6 file://99_hal \
7 file://20hal"
8
9S = "${WORKDIR}/hal-0.5.12rc1"
10 4
11EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h" 5EXTRA_OECONF += "--with-linux-input-header=${STAGING_INCDIR}/linux/input.h"
6EXTRA_OEMAKE += "-e 'udevrulesdir=$(sysconfdir)/udev/rules.d'"
12 7
13PACKAGES =+ "libhal libhal-storage" 8PACKAGES =+ "libhal libhal-storage"
14 9
diff --git a/meta/packages/hal/hal_git.bb b/meta/packages/hal/hal_git.bb
index 85bb777d5f..34ccfe9cf2 100644
--- a/meta/packages/hal/hal_git.bb
+++ b/meta/packages/hal/hal_git.bb
@@ -1,16 +1,7 @@
1DESCRIPTION = "Hardware Abstraction Layer" 1require hal.inc
2HOMEPAGE = "http://freedesktop.org/Software/hal"
3BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal"
4SECTION = "unknown"
5
6LICENSE = "GPLv2+ | AFL"
7
8DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
9RDEPENDS_${PN} += "udev hal-info"
10RRECOMMENDS_${PN} += "udev-utils"
11 2
12PV = "0.5.9.1+git${SRCDATE}" 3PV = "0.5.9.1+git${SRCDATE}"
13PR = "r4" 4PR = "r5"
14 5
15SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \ 6SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
16 file://20hal \ 7 file://20hal \
@@ -18,65 +9,4 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
18 9
19S = "${WORKDIR}/git" 10S = "${WORKDIR}/git"
20 11
21inherit autotools pkgconfig 12DEFAULT_PREFERENCE = "-1"
22
23EXTRA_OECONF = "--with-hwdata=${datadir}/hwdata \
24 --with-expat=${STAGING_DIR_HOST}${prefix} \
25 --with-dbus-sys=${sysconfdir}/dbus-1/system.d \
26 --with-hotplug=${sysconfdir}/hotplug.d \
27 --disable-docbook-docs \
28 --disable-policy-kit \
29 --disable-acpi --disable-acpi-acpid --disable-acpi-proc \
30 --disable-sonypic \
31 --disable-pmu --disable-pci \
32 --disable-pci-ids --disable-pnp-ids \
33 "
34
35do_install_append() {
36 install -d ${D}/etc/default/volatiles
37 install -m 0644 ${WORKDIR}/99_hal ${D}/etc/default/volatiles
38 install -d ${D}/etc/dbus-1/event.d
39 install -m 0755 ${WORKDIR}/20hal ${D}/etc/dbus-1/event.d
40}
41
42# At the time the postinst runs, dbus might not be setup so only restart if running
43pkg_postinst_hal () {
44 # can't do this offline
45 if [ "x$D" != "x" ]; then
46 exit 1
47 fi
48
49 /etc/init.d/populate-volatile.sh update
50
51 grep haldaemon /etc/group || addgroup haldaemon
52 grep haldaemon /etc/passwd || adduser --disabled-password --system --home /var/run/hald --no-create-home haldaemon --ingroup haldaemon -g HAL
53
54 DBUSPID=`pidof dbus-daemon`
55
56 if [ "x$DBUSPID" != "x" ]; then
57 /etc/init.d/dbus-1 reload
58 fi
59}
60
61pkg_postrm_hal () {
62 deluser haldaemon || true
63 delgroup haldaemon || true
64}
65
66FILES_${PN} = "${sysconfdir} \
67 ${bindir}/lshal \
68 ${bindir}/hal-find-by-capability \
69 ${bindir}/hal-find-by-property \
70 ${bindir}/hal-device \
71 ${bindir}/hal-get-property \
72 ${bindir}/hal-set-property \
73 ${bindir}/hal-lock \
74 ${bindir}/hal-is-caller-locked-out \
75 ${bindir}/hal-disable-polling \
76 ${sbindir} \
77 ${libdir}/libhal.so.* \
78 ${libdir}/libhal-storage.so.* \
79 ${libdir}/hal \
80 ${libexecdir} \
81 ${datadir}/hal/fdi \
82 ${datadir}/hal/scripts"