tools/mtd-utils: update to 2.1.1

[openwrt/staging/jow.git] / tools / mtd-utils / Makefile

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index bc15f0a67193d9b43b03199d92dfaacecaba1aa4..e0e083d2b60969ae540ba30969f88cdd85de3025 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,39 +1,55 @@
-# 
-# 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:=2.1.1
 
-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:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=ftp://ftp.infradead.org/pub/mtd-utils/
+PKG_HASH:=8d15e8b70f036d6af1a66011f8ca0e048e9675fa7983d33bea92c24313a232d2
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/host-build.mk
 
-CFLAGS := $(HOSTCFLAGS) -O2 -I../include
 ifneq ($(HOST_OS),Linux)
-CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -I$(STAGING_DIR)/include-host -include getline.h -include endian.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
 
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR="$(LINUX_HEADERS_DIR)" CFLAGS="$(CFLAGS)" TARGETS=mkfs.jffs2
-endef
-
-define Build/Install
-       mkdir -p $(STAGING_DIR)/bin
-       $(CP) $(PKG_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/
+HOST_CONFIGURE_VARS+= \
+       UUID_CFLAGS="-I$(STAGING_DIR_HOST)/include/e2fsprogs/uuid"
+
+HOST_CONFIGURE_ARGS+= \
+       --disable-tests \
+       --without-crypto \
+       --without-xattr \
+       --without-zstd \
+       --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 \
+               $(HOST_BUILD_DIR)/ubinize \
+               $(STAGING_DIR_HOST)/bin/
 endef
 
-define Build/Clean
-       rm -f $(STAGING_DIR)/bin/mkfs.jffs2
+define Host/Clean
+       rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize}
 endef
 
 $(eval $(call HostBuild))