[RFC PATCH mtd-utils 053/110] ubifs-utils: Move ubifs-media.h in libubifs

From: Zhihao Cheng
Date: Fri Jun 07 2024 - 00:39:16 EST


Since ubifs-media.h is only used for ubifs-utils, move it under
ubifs-utils/libubifs.

Signed-off-by: Zhihao Cheng <chengzhihao1@xxxxxxxxxx>
---
ubifs-utils/Makemodule.am | 4 ++--
ubifs-utils/common/ubifs.h | 2 +-
{include/mtd => ubifs-utils/libubifs}/ubifs-media.h | 0
3 files changed, 3 insertions(+), 3 deletions(-)
rename {include/mtd => ubifs-utils/libubifs}/ubifs-media.h (100%)

diff --git a/ubifs-utils/Makemodule.am b/ubifs-utils/Makemodule.am
index cb4e1cf1..d297f7a2 100644
--- a/ubifs-utils/Makemodule.am
+++ b/ubifs-utils/Makemodule.am
@@ -31,7 +31,7 @@ common_SOURCES = \
ubifs-utils/common/lpt.c \
ubifs-utils/common/super.c \
ubifs-utils/common/sign.h \
- include/mtd/ubifs-media.h
+ ubifs-utils/libubifs/ubifs-media.h

if WITH_CRYPTO
common_SOURCES += ubifs-utils/common/crypto.c \
@@ -47,7 +47,7 @@ mkfs_ubifs_SOURCES = \

mkfs_ubifs_LDADD = libmtd.a libubi.a $(ZLIB_LIBS) $(LZO_LIBS) $(ZSTD_LIBS) $(UUID_LIBS) $(LIBSELINUX_LIBS) $(OPENSSL_LIBS) -lm -lpthread
mkfs_ubifs_CPPFLAGS = $(AM_CPPFLAGS) $(ZLIB_CFLAGS) $(LZO_CFLAGS) $(ZSTD_CFLAGS) $(UUID_CFLAGS) $(LIBSELINUX_CFLAGS) \
- -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -rdynamic
+ -I$(top_srcdir)/ubi-utils/include -I$(top_srcdir)/ubifs-utils/common -I $(top_srcdir)/ubifs-utils/libubifs -rdynamic

EXTRA_DIST += ubifs-utils/common/README

diff --git a/ubifs-utils/common/ubifs.h b/ubifs-utils/common/ubifs.h
index 5a909f63..ed297cc7 100644
--- a/ubifs-utils/common/ubifs.h
+++ b/ubifs-utils/common/ubifs.h
@@ -25,7 +25,7 @@
#ifndef __UBIFS_H__
#define __UBIFS_H__

-#include <mtd/ubifs-media.h>
+#include "ubifs-media.h"
#include "libubi.h"

/* Maximum logical eraseblock size in bytes */
diff --git a/include/mtd/ubifs-media.h b/ubifs-utils/libubifs/ubifs-media.h
similarity index 100%
rename from include/mtd/ubifs-media.h
rename to ubifs-utils/libubifs/ubifs-media.h
--
2.13.6