X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fmtd-utils%2FMakefile;h=e56896ae2c2eb1ca7d3fe3dfdf9efdb4bb1bbbda;hb=01bda7f05f8ba05b5b7e57d2be2a38df60435fd0;hp=06be6c7b8d4439b8b7bc0d9c9512f13acec374fb;hpb=a2b97a26e36c5d178f5d6a2e170082a7faa10d18;p=openwrt%2Fopenwrt.git

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 06be6c7b8d..e56896ae2c 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,55 +1,59 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=mtd
-PKG_VERSION:=20090505
+PKG_NAME:=mtd-utils
+PKG_VERSION:=1.5.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d021e049efaff50de33819b8cd2835d4b79bcfa8
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
-PKG_CAT:=zcat
+PKG_MIRROR_MD5SUM:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
 
 HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-CFLAGS := $(HOST_CFLAGS) -I../include
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
+CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT
 ifneq ($(HOST_OS),Linux)
-CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h
+CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h
+MTD_STATIC := 0
+else
+MTD_STATIC := 1
 endif
 
 MTD_MAKEOPTS = \
 	CFLAGS="$(CFLAGS)" \
-	NO_LZO=1 WITHOUT_XATTR=1 \
+	LDFLAGS="$(HOST_LDFLAGS)" \
+	WITHOUT_LZO=1 WITHOUT_XATTR=1 \
 	SUBDIRS="" \
-	BUILDDIR="$(HOST_BUILD_DIR)"
+	BUILDDIR="$(HOST_BUILD_DIR)" \
+	STATIC=$(MTD_STATIC) \
+	V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1)
 
 define Host/Compile
 	$(MAKE) -C $(HOST_BUILD_DIR) \
 		$(MTD_MAKEOPTS) \
-		TARGETS=mkfs.jffs2
-	$(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
-		$(MTD_MAKEOPTS) \
-		TARGETS=ubinize
+		TARGETS="mkfs.jffs2 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
 endef
 
 define Host/Install
 	$(CP) \
 		$(HOST_BUILD_DIR)/mkfs.jffs2 \
-		$(HOST_BUILD_DIR)/ubinize \
+		$(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
+		$(HOST_BUILD_DIR)/ubi-utils/ubinize \
 		$(STAGING_DIR_HOST)/bin/
 endef
 
 define Host/Clean
-	rm -f $(STAGING_DIR_HOST)/bin/mkfs.jffs2
+	rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize}
 endef
 
 $(eval $(call HostBuild))