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 ++++++++-------- meta/recipes-core/util-linux/util-linux_2.24.1.bb | 31 ---------------------- meta/recipes-core/util-linux/util-linux_2.24.2.bb | 31 ++++++++++++++++++++++ 3 files changed, 42 insertions(+), 43 deletions(-) delete mode 100644 meta/recipes-core/util-linux/util-linux_2.24.1.bb create mode 100644 meta/recipes-core/util-linux/util-linux_2.24.2.bb (limited to 'meta/recipes-core/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; diff --git a/meta/recipes-core/util-linux/util-linux_2.24.1.bb b/meta/recipes-core/util-linux/util-linux_2.24.1.bb deleted file mode 100644 index 3fc987562c..0000000000 --- a/meta/recipes-core/util-linux/util-linux_2.24.1.bb +++ /dev/null @@ -1,31 +0,0 @@ -MAJOR_VERSION = "2.24" -require util-linux.inc -PR = "r1" - -# To support older hosts, we need to patch and/or revert -# some upstream changes. Only do this for native packages. -OLDHOST = "" -OLDHOST_class-native = "file://util-linux-native.patch \ - file://util-linux-native-qsort.patch \ - " - -SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ - file://util-linux-ng-2.16-mount_lock_path.patch \ - file://uclibc-__progname-conflict.patch \ - file://configure-sbindir.patch \ - file://fix-configure.patch \ - file://fix-parallel-build.patch \ - ${OLDHOST} \ -" - -SRC_URI[md5sum] = "88d46ae23ca599ac5af9cf96b531590f" -SRC_URI[sha256sum] = "835eb6232cfab0118ef2e4fd649de0ba9f5bd1b8cbf9a7d4d84594541dec8410" - -CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" - -EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ - --disable-fallocate --disable-use-tty-group \ -" -EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ - --disable-fallocate --disable-use-tty-group \ -" diff --git a/meta/recipes-core/util-linux/util-linux_2.24.2.bb b/meta/recipes-core/util-linux/util-linux_2.24.2.bb new file mode 100644 index 0000000000..a2d74306a6 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux_2.24.2.bb @@ -0,0 +1,31 @@ +MAJOR_VERSION = "2.24" +require util-linux.inc +PR = "r1" + +# To support older hosts, we need to patch and/or revert +# some upstream changes. Only do this for native packages. +OLDHOST = "" +OLDHOST_class-native = "file://util-linux-native.patch \ + file://util-linux-native-qsort.patch \ + " + +SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ + file://util-linux-ng-2.16-mount_lock_path.patch \ + file://uclibc-__progname-conflict.patch \ + file://configure-sbindir.patch \ + file://fix-configure.patch \ + file://fix-parallel-build.patch \ + ${OLDHOST} \ +" + +SRC_URI[md5sum] = "3f191727a0d28f7204b755cf1b6ea0aa" +SRC_URI[sha256sum] = "1243d6c07f1c5b38aa4c3814c81a71c24cba7dafe08942916bf216a90a460ff0" + +CACHED_CONFIGUREVARS += "scanf_cv_alloc_modifier=ms" + +EXTRA_OECONF_class-native = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate --disable-use-tty-group \ +" +EXTRA_OECONF_class-nativesdk = "${SHARED_EXTRA_OECONF} \ + --disable-fallocate --disable-use-tty-group \ +" -- cgit v1.2.3-54-g00ecf