From 4e81f27eeef6278abf8b3884fb81eef5fd4fa387 Mon Sep 17 00:00:00 2001 From: Saul Wold Date: Tue, 29 Apr 2014 07:34:00 -0700 Subject: util-linux: Update to 2.24.2 rebase util-linux-native patch (From OE-Core rev: 82f40f320364db499ef35bb1ce85f166b35aa35f) Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../util-linux/util-linux-native-qsort.patch | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'meta/recipes-core/util-linux/util-linux') diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch index 1707683a26..68bf22de8c 100644 --- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch +++ b/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch @@ -13,22 +13,21 @@ Signed-off-by: Robert Yang 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; -- cgit v1.2.3-54-g00ecf