diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/conf/distro/include/poky-fixed-revisions.inc | 2 | ||||
-rw-r--r-- | meta/packages/hal/hal-info.inc | 2 | ||||
-rw-r--r-- | meta/packages/hal/hal-info_20091130.bb (renamed from meta/packages/hal/hal-info_20090414.bb) | 0 | ||||
-rw-r--r-- | meta/packages/hal/hal-info_git.bb | 22 |
4 files changed, 5 insertions, 21 deletions
diff --git a/meta/conf/distro/include/poky-fixed-revisions.inc b/meta/conf/distro/include/poky-fixed-revisions.inc index 630427059a..081a59ab99 100644 --- a/meta/conf/distro/include/poky-fixed-revisions.inc +++ b/meta/conf/distro/include/poky-fixed-revisions.inc | |||
@@ -25,7 +25,7 @@ PREFERRED_VERSION_minimo ?= "0.02+cvs${SRCDATE_minimo}" | |||
25 | PREFERRED_VERSION_oprofile ?= "0.9.6" | 25 | PREFERRED_VERSION_oprofile ?= "0.9.6" |
26 | PREFERRED_VERSION_elfutils ?= "0.89" | 26 | PREFERRED_VERSION_elfutils ?= "0.89" |
27 | PREFERRED_VERSION_hal ?= "0.5.14" | 27 | PREFERRED_VERSION_hal ?= "0.5.14" |
28 | PREFERRED_VERSION_hal-info ?= "20090414" | 28 | PREFERRED_VERSION_hal-info ?= "20091130" |
29 | PREFERRED_VERSION_udev ?= "141" | 29 | PREFERRED_VERSION_udev ?= "141" |
30 | 30 | ||
31 | 31 | ||
diff --git a/meta/packages/hal/hal-info.inc b/meta/packages/hal/hal-info.inc index bea28cd6a7..adba83fb28 100644 --- a/meta/packages/hal/hal-info.inc +++ b/meta/packages/hal/hal-info.inc | |||
@@ -4,9 +4,9 @@ BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal" | |||
4 | SECTION = "unknown" | 4 | SECTION = "unknown" |
5 | 5 | ||
6 | LICENSE = "GPLv2 | AFL" | 6 | LICENSE = "GPLv2 | AFL" |
7 | LIC_FILES_CHKSUM = "file://COPYING;md5=ae484909bad0cf11c8e2071cee6bd4dc" | ||
7 | 8 | ||
8 | SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz" | 9 | SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz" |
9 | S = "${WORKDIR}/${PN}-${PV}" | ||
10 | 10 | ||
11 | inherit autotools pkgconfig | 11 | inherit autotools pkgconfig |
12 | 12 | ||
diff --git a/meta/packages/hal/hal-info_20090414.bb b/meta/packages/hal/hal-info_20091130.bb index e6d50e3981..e6d50e3981 100644 --- a/meta/packages/hal/hal-info_20090414.bb +++ b/meta/packages/hal/hal-info_20091130.bb | |||
diff --git a/meta/packages/hal/hal-info_git.bb b/meta/packages/hal/hal-info_git.bb index 154a4129fa..3fff5e0a7d 100644 --- a/meta/packages/hal/hal-info_git.bb +++ b/meta/packages/hal/hal-info_git.bb | |||
@@ -1,25 +1,9 @@ | |||
1 | DESCRIPTION = "Hardware Abstraction Layer device information" | 1 | require hal-info.inc |
2 | HOMEPAGE = "http://freedesktop.org/Software/hal" | ||
3 | BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal" | ||
4 | SECTION = "unknown" | ||
5 | |||
6 | LICENSE = "GPLv2 | AFL" | ||
7 | 2 | ||
8 | PV = "${SRCDATE}+git" | 3 | PV = "${SRCDATE}+git" |
9 | PR = "r2" | 4 | PR = "r0" |
10 | |||
11 | |||
12 | SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20070831" | ||
13 | 5 | ||
6 | SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20091130" | ||
14 | S = "${WORKDIR}/git" | 7 | S = "${WORKDIR}/git" |
15 | 8 | ||
16 | inherit autotools pkgconfig | ||
17 | |||
18 | EXTRA_OECONF = "--disable-recall --disable-video" | ||
19 | |||
20 | |||
21 | PACKAGE_ARCH = "all" | ||
22 | FILES_${PN} += "/usr/share/hal/" | ||
23 | |||
24 | # By default, use the released hal-info | ||
25 | DEFAULT_PREFERENCE = "-1" | 9 | DEFAULT_PREFERENCE = "-1" |