X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fmtd-utils%2FMakefile;h=7109b874a5dafc6b063dd6e82d725da72d09d23e;hb=720b99215da295a2e7b4acdef30b58bec6acedc2;hp=cc4ae9a5e271dba8b587b820b4769c29c6fe67be;hpb=c6bc77ea365704f3f5c79d64aed069792a4e95b1;p=openwrt%2Fstaging%2Flynxis%2Fomap.git

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index cc4ae9a5e2..7109b874a5 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,38 +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:=20050122
+PKG_NAME:=mtd-utils
+PKG_VERSION:=1.5.2
 
-PKG_SOURCE=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL=http://ftp.debian.org/debian/pool/main/m/mtd
-PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
-PKG_CAT:=zcat
+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_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
 
-PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION).orig
+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
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR="$(LINUX_HEADERS_DIR)" CFLAGS="$(CFLAGS)" TARGETS=mkfs.jffs2
+MTD_MAKEOPTS = \
+	CFLAGS="$(CFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS)" \
+	WITHOUT_LZO=1 WITHOUT_XATTR=1 \
+	SUBDIRS="" \
+	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 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
 endef
 
-define Build/Install
-	$(CP) $(PKG_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR_HOST)/bin/
+define Host/Install
+	$(CP) \
+		$(HOST_BUILD_DIR)/mkfs.jffs2 \
+		$(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
+		$(HOST_BUILD_DIR)/ubi-utils/ubinize \
+		$(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
-	rm -f $(STAGING_DIR_HOST)/bin/mkfs.jffs2
+define Host/Clean
+	rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize}
 endef
 
 $(eval $(call HostBuild))