From fdb6a23ea0d73994d2ff20b719626b82c65413af Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Thu, 3 Feb 2011 21:10:17 -0600 Subject: sysfsutils: Merge bug fix Merge a small bug fix located in the Fedora Core 9 version of this package. Signed-off-by: Mark Hatle --- .../sysfsutils-2.0.0-class-dup.patch | 21 +++++++++++++++++++++ meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb | 6 ++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch (limited to 'meta/recipes-core') diff --git a/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch new file mode 100644 index 0000000000..76597fb654 --- /dev/null +++ b/meta/recipes-core/sysfsutils/sysfsutils-2.1.0/sysfsutils-2.0.0-class-dup.patch @@ -0,0 +1,21 @@ +This patch is from the Fedora Core 9 sysfsutils-2.1.0-3.fc9 package. + +It fixes a problem in the upstream package where not all devices +will be returned by the function. + +The package License indicates this is GPLv2 licensed. + +Signed-off-by: Mark Hatle + +diff -puN lib/sysfs_class.c~sysfsutils_class_dup lib/sysfs_class.c +--- sysfsutils-2.1.0/lib/sysfs_class.c~sysfsutils_class_dup 2006-09-07 17:01:26.000000000 -0500 ++++ sysfsutils-2.1.0-bjking1/lib/sysfs_class.c 2006-09-07 17:01:26.000000000 -0500 +@@ -66,7 +66,7 @@ static int cdev_name_equal(void *a, void + return 0; + + if (strncmp((char *)a, ((struct sysfs_class_device *)b)->name, +- strlen((char *)a)) == 0) ++ SYSFS_NAME_LEN) == 0) + return 1; + + return 0; diff --git a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb index 26577f2124..5343f6446b 100644 --- a/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb +++ b/meta/recipes-core/sysfsutils/sysfsutils_2.1.0.bb @@ -8,9 +8,11 @@ LICENSE_libsysfs = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=3d06403ea54c7574a9e581c6478cc393 \ file://cmd/GPL;md5=d41d4e2e1e108554e0388ea4aecd8d27 \ file://lib/LGPL;md5=b75d069791103ffe1c0d6435deeff72e" -PR = "r0" +PR = "r1" -SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/linux-diag/sysfsutils-${PV}.tar.gz \ + file://sysfsutils-2.0.0-class-dup.patch \ + " SRC_URI[md5sum] = "14e7dcd0436d2f49aa403f67e1ef7ddc" SRC_URI[sha256sum] = "e865de2c1f559fff0d3fc936e660c0efaf7afe662064f2fb97ccad1ec28d208a" -- cgit 1.2.3-korg