mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-26 00:32:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

util-linux-native: fix qsort_r for CentOS 5.10

Browse Source 
The qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on
the host like CentOS 5.x, use qsort() to fix it since they are nearly
identical.

(From OE-Core rev: cda5310e32ce05bc54602d4c18ee2d28a53be57f)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Robert Yang
2014-03-26 03:01:29 -04:00
committed by Richard Purdie
parent cdf0d9715e
commit 8add7ae494
2 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
meta/recipes-core/util-linux/util-linux/util-linux-native-qsort.patch Normal file
View File

@@ -0,0 +1,34 @@
From f220d809be1baa654503bf6ff52f3630b0d7015c Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Wed, 26 Mar 2014 01:30:29 +0000
Subject: [PATCH] sun.c: use qsort() to instead of qsort_r()
qsort_r() was added to glibc in version 2.8, so there is no qsort_r() on
the host like CentOS 5.x.
Upstream-Status: Inappropriate [Other]
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;
}
- 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);
if (array[0] == -1) {
fdisk_info(cxt, _("No partitions defined."));
--
1.8.2.1

4
meta/recipes-core/util-linux/util-linux_2.24.1.bb
View File

@@ -4,7 +4,9 @@ require util-linux.inc
# 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"
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 \