Merge packages changes from OE into poky.

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@386 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 3 insertions, 66 deletions

diff --git a/openembedded/packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch b/openembedded/packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch
deleted file mode 100644
index 447d90f58..000000000
--- a/openembedded/packages/sysfsutils/sysfsutils-1.2.0/libsysfs-write-attribute.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Hi,
-
-int sysfs_write_attribute(struct sysfs_attribute *sysattr,
-                const char *new_value, size_t len)
-
-has a problematic "feature": if the file is empty but readable, nothing gets
-written into it. The attached patch (untested) should fix it.
-
-	Dominik
-
-
-The check which tests whether the value to be written into a sysfs attribute
-is already there should only trigger if the length of both strings is the
-same.
-
-Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
-
---- sysfsutils-1.2.0/lib/sysfs_dir.c.original	2005-02-21 08:10:33.000000000 +0100
-+++ sysfsutils-1.2.0/lib/sysfs_dir.c	2005-02-21 08:14:01.000000000 +0100
-@@ -194,7 +194,8 @@
- 			dprintf("Error reading attribute\n");
- 			return -1;
- 		}
--		if ((strncmp(sysattr->value, new_value, sysattr->len)) == 0) {
-+		if (((strncmp(sysattr->value, new_value, sysattr->len)) == 0)&&
-+		    (len == sysattr->len)) {
- 			dprintf("Attr %s already has the requested value %s\n",
- 					sysattr->name, new_value);
- 			return 0;	
diff --git a/openembedded/packages/sysfsutils/sysfsutils_1.1.0.bb b/openembedded/packages/sysfsutils/sysfsutils_1.1.0.bb
deleted file mode 100644
index 916834711..000000000
--- a/openembedded/packages/sysfsutils/sysfsutils_1.1.0.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-SECTION = "base"
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz"
-S = "${WORKDIR}/sysfsutils-${PV}"
-LICENSE = "GPL"
-inherit autotools
-
-includedir += "/sysfs"
-
-do_stage () {
-	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
-}
diff --git a/openembedded/packages/sysfsutils/sysfsutils_1.2.0.bb b/openembedded/packages/sysfsutils/sysfsutils_1.2.0.bb
deleted file mode 100644
index 8c7055140..000000000
--- a/openembedded/packages/sysfsutils/sysfsutils_1.2.0.bb
+++ /dev/null
@@ -1,22 +0,0 @@
-SECTION = "base"
-DESCRIPTION = "System Utilities Based on Sysfs"
-HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
-LICENSE = "GPLv2"
-SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \
-	   file://libsysfs-write-attribute.patch;patch=1"
-S = "${WORKDIR}/sysfsutils-${PV}"
-PR = "r1"
-
-inherit autotools
-
-includedir += "/sysfs"
-
-PACKAGES_prepend = "libsysfs "
-FILES_libsysfs = "${libdir}/*.so.1.0.2"
-
-do_stage () {
-	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}
-	install -d ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/dlist.h ${STAGING_INCDIR}/sysfs
-	install -m 0644 ${S}/include/libsysfs.h ${STAGING_INCDIR}/sysfs
-}
diff --git a/openembedded/packages/sysfsutils/sysfsutils_1.3.0.bb b/openembedded/packages/sysfsutils/sysfsutils_2.0.0.bb
index 82af8d353..176c8870e 100644
--- a/openembedded/packages/sysfsutils/sysfsutils_1.3.0.bb
+++ b/openembedded/packages/sysfsutils/sysfsutils_2.0.0.bb
@@ -1,3 +1,5 @@
+DEFAULT_PREFERENCE = "-1"
+
 SECTION = "base"
 DESCRIPTION = "System Utilities Based on Sysfs"
 HOMEPAGE = "http://linux-diag.sourceforge.net/Sysfsutils.html"
@@ -11,7 +13,7 @@ inherit autotools
 includedir += "/sysfs"
 
 PACKAGES_prepend = "libsysfs "
-FILES_libsysfs = "${libdir}/*.so.1.0.3"
+FILES_libsysfs = "${libdir}/*.so.2.0.0"
 
 do_stage () {
 	oe_libinstall -a -so -C lib libsysfs ${STAGING_LIBDIR}