1
0

patch-Makefile 2.1 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. --- mtd-utils-1.5.0.orig/Makefile 2012-05-07 09:19:39.000000000 +0200
  2. +++ mtd-utils-1.5.0/Makefile 2014-03-30 15:49:30.000000000 +0200
  3. @@ -16,27 +16,13 @@ endif
  4. TESTS = tests
  5. -MTD_BINS = \
  6. - ftl_format flash_erase nanddump doc_loadbios \
  7. - ftl_check mkfs.jffs2 flash_lock flash_unlock \
  8. - flash_otp_info flash_otp_dump mtd_debug flashcp nandwrite nandtest \
  9. - jffs2dump \
  10. - nftldump nftl_format docfdisk \
  11. - rfddump rfdformat \
  12. - serve_image recv_image \
  13. - sumtool jffs2reader
  14. -UBI_BINS = \
  15. - ubiupdatevol ubimkvol ubirmvol ubicrc32 ubinfo ubiattach \
  16. - ubidetach ubinize ubiformat ubirename mtdinfo ubirsvol
  17. +MTD_BINS = mkfs.jffs2
  18. BINS = $(MTD_BINS)
  19. -BINS += mkfs.ubifs/mkfs.ubifs
  20. -BINS += $(addprefix ubi-utils/,$(UBI_BINS))
  21. SCRIPTS = flash_eraseall
  22. TARGETS = $(BINS)
  23. TARGETS += lib/libmtd.a
  24. -TARGETS += ubi-utils/libubi.a
  25. OBJDEPS = $(BUILDDIR)/include/version.h
  26. @@ -83,12 +69,12 @@ $(BUILDDIR)/include/version.h.tmp:
  27. #
  28. # Utils in top level
  29. #
  30. -obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr_lzo.o compr.o rbtree.o
  31. -LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
  32. -LDLIBS_mkfs.jffs2 = -lz $(LZOLDLIBS)
  33. +obj-mkfs.jffs2 = compr_rtime.o compr_zlib.o compr.o rbtree.o
  34. +LDFLAGS_mkfs.jffs2 = $(ZLIBLDFLAGS)
  35. +LDLIBS_mkfs.jffs2 = -lz
  36. -LDFLAGS_jffs2reader = $(ZLIBLDFLAGS) $(LZOLDFLAGS)
  37. -LDLIBS_jffs2reader = -lz $(LZOLDLIBS)
  38. +LDFLAGS_jffs2reader = $(ZLIBLDFLAGS)
  39. +LDLIBS_jffs2reader = -lz
  40. $(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v))))
  41. @@ -103,7 +89,7 @@ $(call _mkdep,lib/,libmtd.a)
  42. #
  43. obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \
  44. hashtable/hashtable.o hashtable/hashtable_itr.o
  45. -LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid
  46. +LDLIBS_mkfs.ubifs = -lz -lm -luuid
  47. $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a)
  48. #
  49. @@ -117,6 +103,3 @@ obj-libubigen.a = libubigen.o
  50. obj-mtdinfo = libubigen.a
  51. obj-ubinize = libubigen.a libiniparser.a
  52. obj-ubiformat = libubigen.a libscan.a
  53. -
  54. -$(foreach v,libubi.a libubigen.a libiniparser.a libscan.a,$(eval $(call _mkdep,ubi-utils/,$(v))))
  55. -$(foreach v,$(UBI_BINS),$(eval $(call mkdep,ubi-utils/,$(v),libubi.a ubiutils-common.o)))