meta-openembedded/meta-initramfs/recipes-devtools/mtd/ubi-utils-klibc-2.3.0/0001-make-Add-compiler-includes-in-cflags.patch
Jörg Sommer 5f93bf9120
ubi-utils-klibc: Upgrade 2.0.2 -> 2.3.0
* 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>
2025-11-04 16:52:47 -08:00

30 lines
783 B
Diff

From 884ec4c654f1d07a387fdc1dae5640606369f254 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
Date: Sat, 6 Feb 2021 10:56:36 -0800
Subject: [PATCH] make: Add compiler includes in cflags
Fixes
In file included from ../git/ubi-utils/ubiformat.c:47:
| ../git/include/common.h:22:10: fatal error: 'stdbool.h' file not found
| #include <stdbool.h>
| ^~~~~~~~~~~
Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index 5a6e77c..f0003d5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ endif
if WITH_CRYPTO
AM_CPPFLAGS += -DWITH_CRYPTO
endif
+AM_CPPFLAGS += -I$(shell $(CC) -print-file-name=include)
sbin_PROGRAMS =
sbin_SCRIPTS =