diff options
Diffstat (limited to 'target/tools')
| -rw-r--r-- | target/tools/mtd-utils/Makefile | 6 | ||||
| -rw-r--r-- | target/tools/mtd-utils/patches/lzo.patch | 38 |
2 files changed, 26 insertions, 18 deletions
diff --git a/target/tools/mtd-utils/Makefile b/target/tools/mtd-utils/Makefile index 3c90f81c8..38f10de69 100644 --- a/target/tools/mtd-utils/Makefile +++ b/target/tools/mtd-utils/Makefile @@ -4,9 +4,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:= mtd-utils -PKG_VERSION:= 1.5 +PKG_VERSION:= 1.5.0 PKG_RELEASE:= 1 -PKG_MD5SUM:= fbc1e3560a2c941ed2c94a73ae74348c +PKG_MD5SUM:= a4df1ad29684be79b0fa699bdae01faf PKG_SITES:= http://openadk.org/distfiles/ include ../rules.mk @@ -14,7 +14,7 @@ include ../rules.mk all: ${STAGING_HOST_DIR}/bin/mkfs.jffs2 $(WRKBUILD)/.compiled: ${WRKDIST}/.prepared - ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' CPPFLAGS='-DWITHOUT_XATTR=1 -D_GNU_SOURCE -I./include' + ${MAKE} -C ${WRKBUILD} CC='${CC_FOR_BUILD}' CPPFLAGS='-DWITHOUT_XATTR=1 -I./include' touch $@ ${STAGING_HOST_DIR}/bin/mkfs.jffs2: $(WRKBUILD)/.compiled diff --git a/target/tools/mtd-utils/patches/lzo.patch b/target/tools/mtd-utils/patches/lzo.patch index 6d6469ef6..52f16146c 100644 --- a/target/tools/mtd-utils/patches/lzo.patch +++ b/target/tools/mtd-utils/patches/lzo.patch @@ -1,6 +1,6 @@ -diff -Nur mtd-utils-1.5.orig/compr.c mtd-utils-1.5/compr.c ---- mtd-utils-1.5.orig/compr.c 2013-12-24 10:42:36.000000000 +0100 -+++ mtd-utils-1.5/compr.c 2013-12-25 22:18:17.000000000 +0100 +diff -Nur mtd-utils-1.5.0.orig/compr.c mtd-utils-1.5.0/compr.c +--- mtd-utils-1.5.0.orig/compr.c 2012-05-07 09:19:39.000000000 +0200 ++++ mtd-utils-1.5.0/compr.c 2014-02-25 21:05:20.000000000 +0100 @@ -517,9 +517,6 @@ #ifdef CONFIG_JFFS2_RTIME jffs2_rtime_init(); @@ -20,16 +20,26 @@ diff -Nur mtd-utils-1.5.orig/compr.c mtd-utils-1.5/compr.c -#endif return 0; } -diff -Nur mtd-utils-1.5.orig/Makefile mtd-utils-1.5/Makefile ---- mtd-utils-1.5.orig/Makefile 2013-12-24 10:42:36.000000000 +0100 -+++ mtd-utils-1.5/Makefile 2013-12-25 22:22:52.000000000 +0100 -@@ -26,18 +26,12 @@ - rfddump rfdformat \ - serve_image recv_image \ - sumtool jffs2reader +diff -Nur mtd-utils-1.5.0.orig/Makefile mtd-utils-1.5.0/Makefile +--- mtd-utils-1.5.0.orig/Makefile 2012-05-07 09:19:39.000000000 +0200 ++++ mtd-utils-1.5.0/Makefile 2014-02-25 21:13:03.000000000 +0100 +@@ -16,27 +16,13 @@ + + 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 BINS = $(MTD_BINS) -BINS += mkfs.ubifs/mkfs.ubifs @@ -42,7 +52,7 @@ diff -Nur mtd-utils-1.5.orig/Makefile mtd-utils-1.5/Makefile OBJDEPS = $(BUILDDIR)/include/version.h -@@ -84,12 +78,12 @@ +@@ -83,12 +69,12 @@ # # Utils in top level # @@ -60,18 +70,16 @@ diff -Nur mtd-utils-1.5.orig/Makefile mtd-utils-1.5/Makefile $(foreach v,$(MTD_BINS),$(eval $(call mkdep,,$(v)))) -@@ -104,8 +98,8 @@ +@@ -103,7 +89,7 @@ # obj-mkfs.ubifs = crc16.o lpt.o compr.o devtable.o \ hashtable/hashtable.o hashtable/hashtable_itr.o --LDFLAGS_mkfs.ubifs = $(ZLIBLDFLAGS) $(LZOLDFLAGS) $(UUIDLDFLAGS) -LDLIBS_mkfs.ubifs = -lz -llzo2 -lm -luuid -+LDFLAGS_mkfs.ubifs = $(ZLIBLDFLAGS) $(UUIDLDFLAGS) +LDLIBS_mkfs.ubifs = -lz -lm -luuid $(call mkdep,mkfs.ubifs/,mkfs.ubifs,,ubi-utils/libubi.a) # -@@ -119,6 +113,3 @@ +@@ -117,6 +103,3 @@ obj-mtdinfo = libubigen.a obj-ubinize = libubigen.a libiniparser.a obj-ubiformat = libubigen.a libscan.a |