util-linux: Update to 2.24.2

rebase util-linux-native patch

(From OE-Core rev: 82f40f320364db499ef35bb1ce85f166b35aa35f)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold 2014-04-29 07:34:00 -07:00 committed by Richard Purdie
parent ce2cf5e0d4
commit 4e81f27eee
2 changed files with 13 additions and 14 deletions

View File

@ -13,22 +13,21 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
libfdisk/src/sun.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c
index e73c701..f7899ec 100644
--- a/libfdisk/src/sun.c
+++ b/libfdisk/src/sun.c
@@ -427,9 +427,8 @@ static int sun_verify_disklabel(struct fdisk_context *cxt)
else
array[i] = -1;
Index: util-linux-2.24.2/libfdisk/src/sun.c
===================================================================
--- util-linux-2.24.2.orig/libfdisk/src/sun.c
+++ util-linux-2.24.2/libfdisk/src/sun.c
@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f
}
verify_sun_starts = starts;
- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
- (int (*)(const void *,const void *,void *)) verify_sun_cmp,
- verify_sun_starts);
-
+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
+ (int (*)(const void *,const void *)) verify_sun_cmp);
+ (int (*)(const void *,const void *)) verify_sun_cmp);
+
if (array[0] == -1) {
fdisk_info(cxt, _("No partitions defined."));
--
1.8.2.1
return 0;

View File

@ -18,8 +18,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
${OLDHOST} \
"
SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f"
SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410"
SRC_URI[md5sum] = "3f191727a0d28f7204b755cf1b6ea0aa"
SRC_URI[sha256sum] = "1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0"
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"