mirror of
https://git.yoctoproject.org/poky
synced 2026-02-27 11:59:40 +01:00
e2848469ad
Remove 0007-Fix-control-path-where-we-have-str-as-uninitialized-.patch as issue fixed upstream. Rebase other patches. Adjust ptests, pass rate is now 100% again: ====================== All 206 tests passed (6 tests were not run) ====================== (From OE-Core rev: dce25738c82335f2a92b32bd52f0c63e2dbd336e) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
40 lines
1.3 KiB
Diff
40 lines
1.3 KiB
Diff
From 7ff8cbecde7455b530fa7894a78d2326799f2556 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 4/4] 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 ba0d68d..1d2447f 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;
|
|
--
|
|
2.17.1
|
|
|