summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch33
-rw-r--r--meta/recipes-core/util-linux/util-linux_2.32.1.bb6
2 files changed, 0 insertions, 39 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
deleted file mode 100644
index 68bf22de8c..0000000000
--- a/meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Wed, 26 Mar 2014 01:30:29 +0000
4Subject: [PATCH] sun.c: use qsort() to instead of qsort_r()
5
6qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on
7the host like CentOS 5.x.
8
9Upstream-Status: Inappropriate [Other]
10
11Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
12---
13 libfdisk/src/sun.c | 5 ++---
14 1 file changed, 2 insertions(+), 3 deletions(-)
15
16Index: util-linux-2.24.2/libfdisk/src/sun.c
17===================================================================
18--- util-linux-2.24.2.orig/libfdisk/src/sun.c
19+++ util-linux-2.24.2/libfdisk/src/sun.c
20@@ -431,10 +431,9 @@ static int sun_verify_disklabel(struct f
21 }
22 verify_sun_starts = starts;
23
24- qsort_r(array,ARRAY_SIZE(array),sizeof(array[0]),
25- (int (*)(const void *,const void *,void *)) verify_sun_cmp,
26- verify_sun_starts);
27-
28+ qsort(array,ARRAY_SIZE(array),sizeof(array[0]),
29+ (int (*)(const void *,const void *)) verify_sun_cmp);
30+
31 if (array[0] == -1) {
32 fdisk_info(cxt, _("No partitions defined."));
33 return 0;
diff --git a/meta/recipes-core/util-linux/util-linux_2.32.1.bb b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
index b0492afff3..0f860c221b 100644
--- a/meta/recipes-core/util-linux/util-linux_2.32.1.bb
+++ b/meta/recipes-core/util-linux/util-linux_2.32.1.bb
@@ -1,14 +1,8 @@
1require util-linux.inc 1require util-linux.inc
2 2
3# To support older hosts, we need to patch and/or revert
4# some upstream changes. Only do this for native packages.
5OLDHOST = ""
6OLDHOST_class-native = "file://util-linux-native-qsort.patch"
7
8SRC_URI += "file://configure-sbindir.patch \ 3SRC_URI += "file://configure-sbindir.patch \
9 file://runuser.pamd \ 4 file://runuser.pamd \
10 file://runuser-l.pamd \ 5 file://runuser-l.pamd \
11 ${OLDHOST} \
12 file://ptest.patch \ 6 file://ptest.patch \
13 file://run-ptest \ 7 file://run-ptest \
14 file://display_testname_for_subtest.patch \ 8 file://display_testname_for_subtest.patch \