[meta-gplv2] [PATCH] coreutils: Rebase glibc 2.34 patch on top of series


Khem Raj
 

This should fix the patch errors due to order of patching last time.

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
...Reorder-includes-for-glibc-2.34-portability.patch | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch b/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch
index 0d9b5e2..f37cb47 100644
--- a/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch
+++ b/recipes-core/coreutils/coreutils-6.9/0001-sort.c-Reorder-includes-for-glibc-2.34-portability.patch
@@ -16,11 +16,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com>
src/sort.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

-diff --git a/src/sort.c b/src/sort.c
-index 58ca66a..48b22c8 100644
--- a/src/sort.c
+++ b/src/sort.c
-@@ -21,11 +21,11 @@
+@@ -21,12 +21,12 @@

├śrn E. Hansen added NLS support in 1997. */

@@ -28,12 +26,10 @@ index 58ca66a..48b22c8 100644
+#include <sys/wait.h>
#include <config.h>

+ #include <assert.h>
#include <getopt.h>
-#include <sys/types.h>
-#include <sys/wait.h>
#include <signal.h>
- #include "system.h"
- #include "argmatch.h"
---
-2.32.0
-
+ #if HAVE_WCHAR_H
+ # include <wchar.h>
--
2.32.0

Join yocto@lists.yoctoproject.org to automatically receive all group messages.