X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=tools%2Fmtd-utils%2FMakefile;h=ff000b99e3ab05aeee77ac99eb0b93b687da2310;hb=c844d6a8e43a5b76f4aba0a7ab59fe8286482044;hp=f831e3c348d0e94b009d2836542284dc2ad31a5f;hpb=df23709f165b2e74e398080f1c0706d011263412;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index f831e3c348..ff000b99e3 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,44 +7,42 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_VERSION:=1.5.1
+PKG_VERSION:=2.0.2
 
-PKG_SOURCE_VERSION:=92686f212c9a4e16891c6a3c57629cbf4f0f8360
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MIRROR_MD5SUM:=154592f5bbb01e1e98bdd26c8a592305
-PKG_CAT:=zcat
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
+PKG_HASH:=fb3de61be8e932abb424e8ea3c30298f553d5f970ad158a737bb303bbf9660b8
 
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 
-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 -I$(CURDIR)/include -include fls.h
+  HOST_CFLAGS += \
+	-I$(CURDIR)/include \
+	-Dloff_t=off_t \
+	-D__BYTE_ORDER=BYTE_ORDER \
+	-include endian.h \
+	-DNO_NATIVE_SUPPORT \
+	-include fls.h
 endif
 
-MTD_MAKEOPTS = \
-	CFLAGS="$(CFLAGS)" \
-	LDFLAGS="$(HOST_LDFLAGS)" \
-	WITHOUT_LZO=1 WITHOUT_XATTR=1 \
-	SUBDIRS="" \
-	BUILDDIR="$(HOST_BUILD_DIR)"
-
-define Host/Compile
-	$(MAKE) -C $(HOST_BUILD_DIR) \
-		$(MTD_MAKEOPTS) \
-		TARGETS="mkfs.jffs2 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
-endef
+HOST_CONFIGURE_VARS+= \
+	UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
+
+HOST_CONFIGURE_ARGS+= \
+	--disable-tests \
+	--without-xattr \
+	--without-lzo
+
+HOST_MAKE_FLAGS += \
+	PROGRAMS="mkfs.jffs2 ubinize mkfs.ubifs"
 
 define Host/Install
 	$(CP) \
 		$(HOST_BUILD_DIR)/mkfs.jffs2 \
-		$(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
-		$(HOST_BUILD_DIR)/ubi-utils/ubinize \
+		$(HOST_BUILD_DIR)/mkfs.ubifs \
+		$(HOST_BUILD_DIR)/ubinize \
 		$(STAGING_DIR_HOST)/bin/
 endef