diff options
authorBastian Germann <>2020-01-29 19:50:13 +0100
committerDavid Oberhollenzer <>2020-01-30 11:23:02 +0100
commit42e051acd32c28c2f93c946d0c4bf6f9eada2aa4 (patch)
parent87809c4804d3355ecd2fd0bd3362526fa27bf953 (diff)
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 <>
2 files changed, 4 insertions, 1 deletions
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 <ctype.h>
#include <stdint.h>
#include <mtd/ubi-user.h>
-#include <mtd/ubi-media.h>
#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;
diff --git a/ubi-utils/ubiformat.c b/ubi-utils/ubiformat.c
index be40e52..d1b12e4 100644
--- a/ubi-utils/ubiformat.c
+++ b/ubi-utils/ubiformat.c
@@ -38,6 +38,7 @@
#include <getopt.h>
#include <fcntl.h>
+#include <mtd/ubi-media.h>
#include <libubi.h>
#include <libmtd.h>
#include <libscan.h>