X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9045e25a9b5281a9cfe1e55b274e35449925cbbe..9e9816322cf9331ed701a0d68a4f841bab106790:/tools/mtd-utils/Makefile?ds=sidebyside

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index bc15f0a67..7dc31f51a 100644
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2006 OpenWrt.org
+#
+# Copyright (C) 2006-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -7,33 +7,57 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd
-PKG_VERSION:=20050122
-
-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_VERSION:=20101124
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=c1a7889da754dfac2f130772daef783980c65d5d
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_MD5SUM:=78e5e74957f458bd808a6d4af0a38071
 PKG_CAT:=zcat
 
-PKG_BUILD_DIR:=$(TOOL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION).orig
+HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/host-build.mk
 
-CFLAGS := $(HOSTCFLAGS) -O2 -I../include
+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 -I$(STAGING_DIR)/include-host -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
 endif
 
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR)/util LINUXDIR="$(LINUX_HEADERS_DIR)" CFLAGS="$(CFLAGS)" TARGETS=mkfs.jffs2
+MTD_MAKEOPTS = \
+	CFLAGS="$(CFLAGS)" \
+	NO_LZO=1 WITHOUT_XATTR=1 \
+	SUBDIRS="" \
+	BUILDDIR="$(HOST_BUILD_DIR)"
+
+define Host/Compile
+	$(MAKE) -C $(HOST_BUILD_DIR)/lib \
+		$(MTD_MAKEOPTS) \
+		TARGETS="libmtd.a libcrc32.a" \
+		LIBS="libmtd libcrc32"
+	$(MAKE) -C $(HOST_BUILD_DIR) \
+		$(MTD_MAKEOPTS) \
+		TARGETS=mkfs.jffs2
+	$(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
+		$(MTD_MAKEOPTS) \
+		TARGETS=ubinize
+	$(MAKE) -C $(HOST_BUILD_DIR)/mkfs.ubifs \
+		$(MTD_MAKEOPTS) \
+		BUILDDIR="$(HOST_BUILD_DIR)/mkfs.ubifs"
 endef
 
-define Build/Install
-	mkdir -p $(STAGING_DIR)/bin
-	$(CP) $(PKG_BUILD_DIR)/util/mkfs.jffs2 $(STAGING_DIR)/bin/
+define Host/Install
+	$(CP) \
+		$(HOST_BUILD_DIR)/mkfs.jffs2 \
+		$(HOST_BUILD_DIR)/mkfs.ubifs/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))