diff options
| author | Bernhard Walle <walle@corscience.de> | 2012-04-05 12:50:09 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2012-04-08 09:35:01 +0200 |
| commit | 48f85540c8b68255d0b8db1a3ff9f2d3326e8708 (patch) | |
| tree | 23220fc3f3ba1e52ec31d0118256517872daf235 | |
| parent | a8d5580e8ccf63a8756caefa13ee13885050966b (diff) | |
| download | ptxdist-48f85540c8b68255d0b8db1a3ff9f2d3326e8708.tar.gz ptxdist-48f85540c8b68255d0b8db1a3ff9f2d3326e8708.tar.xz | |
mtd-utils: Fix build of UBI tools when mkfs.ubifs is not enabled
This problem has been introduced in d4ba37630767095330ddc5cdc3c154cd2e4f757d.
See http://thread.gmane.org/gmane.comp.embedded.ptxdist.devel/9087.
Reported-by: Alexander Dahl <post@lespocky.de>
Signed-off-by: Bernhard Walle <walle@corscience.de>
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
| -rw-r--r-- | patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch index 81606482d..2cbce0942 100644 --- a/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch +++ b/patches/mtd-utils-1.4.9/0001-make-ubifs-optional.patch @@ -5,20 +5,19 @@ Subject: [PATCH] make ubifs optional Signed-off-by: Bernhard Walle <bernhard@bwalle.de> --- Makefile | 2 ++ - 1 files changed, 2 insertions(+), 0 deletions(-) + 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile -index 17a1216..000dc86 100644 +index 17a1216..5e1692f 100644 --- a/Makefile +++ b/Makefile -@@ -30,8 +30,10 @@ UBI_BINS = \ +@@ -30,7 +30,9 @@ UBI_BINS = \ ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol BINS = $(MTD_BINS) +ifneq ($(WITHOUT_MKUBIFS), 1) BINS += mkfs.ubifs/mkfs.ubifs - BINS += $(addprefix ubi-utils/,$(UBI_BINS)) +endif + BINS += $(addprefix ubi-utils/,$(UBI_BINS)) SCRIPTS = flash_eraseall - TARGETS = $(BINS) |