aboutsummaryrefslogtreecommitdiff
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:36:38 +0100
commit82f40f320364db499ef35bb1ce85f166b35aa35f (patch)
tree5884a3a6e04e38475ee5c4ca3afec361b01812c1
parent17679accf8dcca9cc09ed9b72644366859b2b23e (diff)
downloadopenembedded-core-82f40f320364db499ef35bb1ce85f166b35aa35f.zip
openembedded-core-82f40f320364db499ef35bb1ce85f166b35aa35f.tar.gz
openembedded-core-82f40f320364db499ef35bb1ce85f166b35aa35f.tar.bz2
util-linux: Update to 2.24.2
rebase util-linux-native patch Signed-off-by: Saul Wold <sgw@linux.intel.com>
-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 1707683..68bf22d 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>
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;
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 3fc9875..a2d7430 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 \
${OLDHOST} \
"
-SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f"
-SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410"
+SRC_URI[md5sum] = "3f191727a0d28f7204b755cf1b6ea0aa"
+SRC_URI[sha256sum] = "1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0"
CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms"