summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2014-04-29 07:34:00 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-04-30 16:39:07 +0100
commit4e81f27eeef6278abf8b3884fb81eef5fd4fa387 (patch)
tree316e2d006d7957ea9a1a91b7379a26af10f19441
parentce2cf5e0d4726dcbbcca2e3aec73f39ee6e2f9f5 (diff)
downloadpoky-4e81f27eeef6278abf8b3884fb81eef5fd4fa387.tar.gz
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>
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch23
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.24.2.bb (renamed from meta/recipes-core/util-linux/util-linux_2.24.1.bb)4
2 files changed, 13 insertions, 14 deletions
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 <liezhi.yang@windriver.com>
13 libfdisk/src/sun.c | 5 ++--- 13 libfdisk/src/sun.c | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-) 14 1 file changed, 2 insertions(+), 3 deletions(-)
15 15
16diff --git a/libfdisk/src/sun.c b/libfdisk/src/sun.c 16Index: util-linux-2.24.2/libfdisk/src/sun.c
17index e73c701..f7899ec 100644 17===================================================================
18--- a/libfdisk/src/sun.c 18--- util-linux-2.24.2.orig/libfdisk/src/sun.c
19+++ b/libfdisk/src/sun.c 19+++ util-linux-2.24.2/libfdisk/src/sun.c
20@@ -427,9 +427,8 @@ static int sun_verify_disklabel(struct fdisk_context *cxt) 20@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f
21 else
22 array[i] = -1;
23 } 21 }
22 verify_sun_starts = starts;
23
24- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]), 24- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
25- (int (*)(const void *,const void *,void *)) verify_sun_cmp, 25- (int (*)(const void *,const void *,void *)) verify_sun_cmp,
26- verify_sun_starts); 26- verify_sun_starts);
27-
27+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]), 28+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
28+ (int (*)(const void *,const void *)) verify_sun_cmp); 29+ (int (*)(const void *,const void *)) verify_sun_cmp);
29 30+
30 if (array[0] == -1) { 31 if (array[0] == -1) {
31 fdisk_info(cxt, _("No partitions defined.")); 32 fdisk_info(cxt, _("No partitions defined."));
32-- 33 return 0;
331.8.2.1
34
diff --git a/meta/recipes-core/util-linux/util-linux_2.24.1.bb b/meta/recipes-core/util-linux/util-linux_2.24.2.bb
index 3fc987562c..a2d74306a6 100644
--- a/meta/recipes-core/util-linux/util-linux_2.24.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.24.2.bb
@@ -18,8 +18,8 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
18 ${OLDHOST} \ 18 ${OLDHOST} \
19" 19"
20 20
21SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f" 21SRC_URI[md5sum] = "3f191727a0d28f7204b755cf1b6ea0aa"
22SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410" 22SRC_URI[sha256sum] = "1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0"
23 23
24CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" 24CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"
25 25