Compile libuuid only when needed - mkfs.ubifs selected.
Signed-off-by: Ladislav Michl <la...@linux-mips.org>
---
.../mtd-utils-1.3.1/make-mkubifs-optional.patch | 24 ++++++++++++++++++++
patches/mtd-utils-1.3.1/series | 1 +
rules/mtd-utils.in | 2 +-
rules/mtd-utils.make | 4 +++
4 files changed, 30 insertions(+), 1 deletions(-)
create mode 100644 patches/mtd-utils-1.3.1/make-mkubifs-optional.patch
diff --git a/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch
b/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch
new file mode 100644
index 0000000..ec99f13
--- /dev/null
+++ b/patches/mtd-utils-1.3.1/make-mkubifs-optional.patch
@@ -0,0 +1,24 @@
+From: Ladislav Michl <la...@linux-mips.org>
+Date: Tue, 3 Aug 2010 13:00:00 +0200
+Subject: [PATCH] make mkubifs optional
+
+Signed-off-by: Ladislav Michl <la...@linux-mips.org>
+---
+ Makefile | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+--- a/Makefile 2010-08-03 14:55:20.000000000 +0200
++++ b/Makefile 2010-08-03 14:24:39.000000000 +0200
+@@ -11,7 +11,11 @@
+ CPPFLAGS += -DWITHOUT_LZO
+ endif
+
+-SUBDIRS = ubi-utils mkfs.ubifs
++SUBDIRS = ubi-utils
++
++ifneq ($(WITHOUT_MKUBIFS), 1)
++ SUBDIRS += mkfs.ubifs
++endif
+
+ TARGETS = ftl_format flash_erase flash_eraseall nanddump doc_loadbios \
+ ftl_check mkfs.jffs2 flash_lock flash_unlock flash_info \
diff --git a/patches/mtd-utils-1.3.1/series b/patches/mtd-utils-1.3.1/series
index 32f7cf1..44806a8 100644
--- a/patches/mtd-utils-1.3.1/series
+++ b/patches/mtd-utils-1.3.1/series
@@ -1 +1,2 @@
make-liblzo-optional.patch
+make-mkubifs-optional.patch
diff --git a/rules/mtd-utils.in b/rules/mtd-utils.in
index 4d33954..ad550e1 100644
--- a/rules/mtd-utils.in
+++ b/rules/mtd-utils.in
@@ -4,7 +4,7 @@ menuconfig MTD_UTILS
tristate
prompt "mtd-utils "
select ZLIB
- select LIBUUID
+ select LIBUUID if MTD_UTILS_MKFS_UBIFS
select LIBLZO if MTD_UTILS_USE_LIBLZO
help
Memory Technology Device Utilities
diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make
index 1bb471e..1797f41 100644
--- a/rules/mtd-utils.make
+++ b/rules/mtd-utils.make
@@ -47,6 +47,10 @@ ifndef PTXCONF_MTD_UTILS_USE_LIBLZO
MTD_UTILS_COMPILE_ENV += WITHOUT_LZO=1
endif
+ifndef PTXCONF_MTD_UTILS_MKFS_UBIFS
+MTD_UTILS_COMPILE_ENV += WITHOUT_MKUBIFS=1
+endif
+
MTD_UTILS_MAKEVARS := BUILDDIR=$(MTD_UTILS_DIR)
MTD_UTILS_MAKE_PAR := NO
--
1.5.3.8
--
ptxdist mailing list
ptxdist@pengutronix.de
