diff options
author | Qing He <qing.he@intel.com> | 2010-07-20 11:13:28 +0800 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-23 23:53:30 +0100 |
commit | ec6705a4889766da40cc493be578f11f59b88bfe (patch) | |
tree | fc6df99e538ac09dfe45152f0c096d4970764fd0 | |
parent | 8bad27517486ff69b961a03f5d25a9c5aa5a2b7e (diff) | |
download | openembedded-core-ec6705a4889766da40cc493be578f11f59b88bfe.tar.gz openembedded-core-ec6705a4889766da40cc493be578f11f59b88bfe.tar.bz2 openembedded-core-ec6705a4889766da40cc493be578f11f59b88bfe.zip |
hal-info: upgrade to version 20091130
from 20090414
changes:
- consolidate hal-info.inc and hal-info_git.bb, git version is used
as a reference and is not preferred
- preferred version updated to 20091130
Signed-off-by: Qing He <qing.he@intel.com>
-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}" PREFERRED_VERSION_oprofile ?= "0.9.6" PREFERRED_VERSION_elfutils ?= "0.89" PREFERRED_VERSION_hal ?= "0.5.14" -PREFERRED_VERSION_hal-info ?= "20090414" +PREFERRED_VERSION_hal-info ?= "20091130" PREFERRED_VERSION_udev ?= "141" 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" SECTION = "unknown" LICENSE = "GPLv2 | AFL" +LIC_FILES_CHKSUM = "file://COPYING;md5=ae484909bad0cf11c8e2071cee6bd4dc" SRC_URI = "http://hal.freedesktop.org/releases/${PN}-${PV}.tar.gz" -S = "${WORKDIR}/${PN}-${PV}" inherit autotools pkgconfig 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 @@ -DESCRIPTION = "Hardware Abstraction Layer device information" -HOMEPAGE = "http://freedesktop.org/Software/hal" -BUGTRACKER = "http://bugs.freedesktop.org/buglist.cgi?product=hal" -SECTION = "unknown" - -LICENSE = "GPLv2 | AFL" +require hal-info.inc PV = "${SRCDATE}+git" -PR = "r2" - - -SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20070831" +PR = "r0" +SRC_URI = "git://anongit.freedesktop.org/hal-info/;protocol=git;rev=HAL_INFO_20091130" S = "${WORKDIR}/git" -inherit autotools pkgconfig - -EXTRA_OECONF = "--disable-recall --disable-video" - - -PACKAGE_ARCH = "all" -FILES_${PN} += "/usr/share/hal/" - -# By default, use the released hal-info DEFAULT_PREFERENCE = "-1" |