mirror of
https://git.yoctoproject.org/poky
synced 2026-03-02 13:29:40 +01:00
ecabf7386f
Drop 0001-ppc_initreg.c-Incliude-asm-ptrace.h-for-pt_regs-defi.patch Drop 0001-musl-obstack-fts.patch (upstream has fixed the issues). Drop a few other chunks where upstream has fixed the issues or removed the code being patched. Adjust ptests to pass again. (From OE-Core rev: d358212bb557c99b266a0022ce973782c8c4d260) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From ce3b1403bd88261b5461a9dcb7d6d6be9185703e Mon Sep 17 00:00:00 2001
|
|
From: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Date: Wed, 1 May 2019 22:15:03 +0100
|
|
Subject: [PATCH] Fix error on musl:
|
|
|
|
| ../../elfutils-0.176/tests/elfstrmerge.c: In function 'main':
|
|
| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: error: 'ALLPERMS' undeclared (first use in this function); did you mean 'EPERM'?
|
|
| fdnew = open (fnew, O_WRONLY | O_CREAT, st.st_mode & ALLPERMS);
|
|
| ^~~~~~~~
|
|
| EPERM
|
|
| ../../elfutils-0.176/tests/elfstrmerge.c:370:60: note: each undeclared identifier is reported only once for each function it appears in
|
|
|
|
Upstream-Status: Inappropriate [workaround in musl]
|
|
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
|
|
---
|
|
tests/elfstrmerge.c | 5 +++++
|
|
1 file changed, 5 insertions(+)
|
|
|
|
diff --git a/tests/elfstrmerge.c b/tests/elfstrmerge.c
|
|
index abbdf3f..bd90f4d 100644
|
|
--- a/tests/elfstrmerge.c
|
|
+++ b/tests/elfstrmerge.c
|
|
@@ -33,6 +33,11 @@
|
|
#include ELFUTILS_HEADER(dwelf)
|
|
#include "elf-knowledge.h"
|
|
|
|
+/* for musl */
|
|
+#ifndef ALLPERMS
|
|
+# define ALLPERMS (S_ISUID|S_ISGID|S_ISVTX|S_IRWXU|S_IRWXG|S_IRWXO)/* 07777 */
|
|
+#endif
|
|
+
|
|
/* The original ELF file. */
|
|
static int fd = -1;
|
|
static Elf *elf = NULL;
|