summaryrefslogtreecommitdiff
path: root/package/mtd-utils/patches
diff options
context:
space:
mode:
authorPhil Sutter <phil@nwl.cc>2014-06-17 03:07:40 +0200
committerWaldemar Brodkorb <wbx@openadk.org>2014-06-18 09:10:35 +0200
commitf5cb6e11a95f19f921e97848ea9aa0d23b81127c (patch)
tree1b98c0b5d409f6506c157a255fe2f22751ed5450 /package/mtd-utils/patches
parent0d5977574bd73b1312f7c15dce0d027ccbf378ba (diff)
package/mtd-utils: allow to be used on the target
Signed-off-by: Phil Sutter <phil@nwl.cc>
Diffstat (limited to 'package/mtd-utils/patches')
-rw-r--r--package/mtd-utils/patches/patch-Makefile75
1 files changed, 21 insertions, 54 deletions
diff --git a/package/mtd-utils/patches/patch-Makefile b/package/mtd-utils/patches/patch-Makefile
index 53ed8640e..89a07af54 100644
--- a/package/mtd-utils/patches/patch-Makefile
+++ b/package/mtd-utils/patches/patch-Makefile
@@ -1,22 +1,18 @@
---- mtd-utils-1.5.0.orig/Makefile 2012-05-07 09:19:39.000000000 +0200
-+++ mtd-utils-1.5.0/Makefile 2014-03-30 15:49:30.000000000 +0200
-@@ -16,27 +16,13 @@ endif
-
- TESTS = tests
-
--MTD_BINS = \
-- ftl_format flash_erase nanddump doc_loadbios \
-- ftl_check mkfs.jffs2 flash_lock flash_unlock \
-- flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite nandtest \
-- jffs2dump \
-- nftldump nftl_format docfdisk \
-- rfddump rfdformat \
-- serve_image recv_image \
-- sumtool jffs2reader
--UBI_BINS = \
-- ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \
-- ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
-+MTD_BINS = mkfs.jffs2
+ - allow disabling ubifs tools
+ - drop the tests
+--- mtd-utils-ca39eb1.orig/Makefile 2012-05-07 09:19:39.000000000 +0200
++++ mtd-utils-ca39eb1/Makefile 2014-06-02 23:39:37.857504666 +0200
+@@ -14,7 +14,7 @@ else
+ LZOLDLIBS = -llzo2
+ endif
+
+-TESTS = tests
++#TESTS = tests
+
+ MTD_BINS = \
+ ftl_format flash_erase nanddump doc_loadbios \
+@@ -30,13 +30,16 @@ UBI_BINS = \
+ ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
BINS = $(MTD_BINS)
-BINS += mkfs.ubifs/mkfs.ubifs
@@ -25,41 +21,12 @@
TARGETS = $(BINS)
TARGETS += lib/libmtd.a
--TARGETS += ubi-utils/libubi.a
++
++ifneq ($(WITHOUT_UBI), 1)
++BINS += mkfs.ubifs/mkfs.ubifs
++BINS += $(addprefix ubi-utils/,$(UBI_BINS))
+ TARGETS += ubi-utils/libubi.a
++endif
OBJDEPS = $(BUILDDIR)/include/version.h
-@@ -83,12 +69,12 @@ $(BUILDDIR)/include/version.h.tmp:
- #
- # Utils in top level
- #
--obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr_lzo.o compr.o rbtree.o
--LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
--LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS)
-+obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr.o rbtree.o
-+LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS)
-+LDLIBS_mkfs.jffs2 = -lz
-
--LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
--LDLIBS_jffs2reader = -lz $(LZOLDLIBS)
-+LDFLAGS_jffs2reader = $(ZLIBLDFLAGS)
-+LDLIBS_jffs2reader = -lz
-
- $(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v))))
-
-@@ -103,7 +89,7 @@ $(call _mkdep,lib/,libmtd.a)
- #
- obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
- hashtable/hashtable.o hashtable/hashtable_itr.o
--LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
-+LDLIBS_mkfs.ubifs = -lz -lm -luuid
- $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
-
- #
-@@ -117,6 +103,3 @@ obj-libubigen.a = libubigen.o
- obj-mtdinfo = libubigen.a
- obj-ubinize = libubigen.a libiniparser.a
- obj-ubiformat = libubigen.a libscan.a
--
--$(foreach v,libubi.a libubigen.a libiniparser.a libscan.a,$(eval $(call _mkdep,ubi-utils/,$(v))))
--$(foreach v,$(UBI_BINS),$(eval $(call mkdep,ubi-utils/,$(v),libubi.a ubiutils-common.o)))