mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-01-01 13:58:06 +00:00
5f93bf9120
* 0002-Instead-of-doing-preprocessor-magic-just-output-off_.patch was
applied upstream as 64667fe63ba9dd78adb9c4abf04bc3e4e25a0fd7
* 0005-common.h-replace-getline-with-fgets.patch was applied upstream as
38a6e3e29d90e11c3d5147e609d7b8e021b2cabf
* Updated all other patches due to patch fuzz
* ubihealthd fails to build with type mismatch errors, because it is not
used, it gets disabled.
```
In file included from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/sys/signalfd.h:22,
from ../sources/ubi-utils-klibc-2.0.2/ubi-utils/ubihealthd.c:16:
/build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/bits/types/sigset_t.h:7:20: error: conflicting types for 'sigse
t_t'; have '__sigset_t'
7 | typedef __sigset_t sigset_t;
| ^~~~~~~~
In file included from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/signal.h:14,
from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/sys/poll.h:10,
from /build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/poll.h:1,
from ../sources/ubi-utils-klibc-2.0.2/ubi-utils/ubihealthd.c:6:
/build/tmp/work/x86-64-v3-poky-linux/ubi-utils-klibc/2.0.2/recipe-sysroot/usr/lib/klibc/include/arch/x86_64/klibc/archsignal.h:13:23: note: previous declaratio
n of 'sigset_t' with type 'sigset_t' {aka 'long unsigned int'}
13 | typedef unsigned long sigset_t;
| ^~~~~~~~
```
* add new package for ubiscan
Signed-off-by: Jörg Sommer <joerg.sommer@navimatix.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
38 lines
1022 B
Diff
38 lines
1022 B
Diff
From e596ae99059c28fa9bb3461e03e7ecaacbf41727 Mon Sep 17 00:00:00 2001
|
|
From: Andrea Adami <andrea.adami@gmail.com>
|
|
Date: Wed, 23 May 2018 15:34:59 +0200
|
|
Subject: [PATCH] libmissing.h: fix klibc build when using glibc toolchain
|
|
|
|
klibc lacks execinfo.h so adda guard around it.
|
|
Note: build with musl toolchain is ok even without this patch.
|
|
|
|
Fix build error:
|
|
|
|
| In file included from ../git/lib/execinfo.c:1:0:
|
|
| ../git/include/libmissing.h:7:10: fatal error: execinfo.h:
|
|
No such file or directory
|
|
|
|
Upstream-Status: Inappropriate [klibc specific]
|
|
|
|
Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
|
|
---
|
|
include/libmissing.h | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/include/libmissing.h b/include/libmissing.h
|
|
index 0196033..832c372 100644
|
|
--- a/include/libmissing.h
|
|
+++ b/include/libmissing.h
|
|
@@ -1,9 +1,11 @@
|
|
#ifndef LIBMISSING_H
|
|
#define LIBMISSING_H
|
|
|
|
+#ifndef __KLIBC__
|
|
#ifdef HAVE_EXECINFO_H
|
|
#include <execinfo.h>
|
|
#endif
|
|
+#endif
|
|
|
|
#ifndef HAVE_EXECINFO_H
|
|
int backtrace(void **buffer, int size);
|