From 42e051acd32c28c2f93c946d0c4bf6f9eada2aa4 Mon Sep 17 00:00:00 2001 From: Bastian Germann Date: Wed, 29 Jan 2020 19:50:13 +0100 Subject: libubi: remove private kernel header from includes libubi.h includes ubi-media.h which was made private in the kernel a long time ago. There are users of libubi.h, e.g. swupdate, which have to have ubi-media.h available at build time with this inclusion. However, libubi.h uses only one symbol from ubi-media.h. Define that symbol in the header to enable using libubi.h without installing ubi-media.h. Make up for the transitive symbol use in ubiformat.c by including ubi-media.h. Signed-off-by: Bastian Germann Signed-off-by: David Oberhollenzer --- include/libubi.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/libubi.h b/include/libubi.h index 46596a3..46c732a 100644 --- a/include/libubi.h +++ b/include/libubi.h @@ -26,7 +26,6 @@ #include #include #include -#include #ifdef __cplusplus extern "C" { @@ -38,6 +37,9 @@ extern "C" { /* Maximum physical eraseblock size in bytes */ #define UBI_MAX_PEB_SZ (2*1024*1024) +/* The maximum volume name length (from Linux's ubi-media.h) */ +#define UBI_VOL_NAME_MAX 127 + /* UBI library descriptor */ typedef void * libubi_t; -- cgit v1.2.3