add ubinize to the mtd-utils build

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

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index cc4ae9a5e271dba8b587b820b4769c29c6fe67be..06be6c7b8d4439b8b7bc0d9c9512f13acec374fb 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -7,14 +7,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd

-PKG_VERSION:=20050122
+PKG_VERSION:=20090505

 
 

-PKG_SOURCE=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz
-PKG_SOURCE_URL=http://ftp.debian.org/debian/pool/main/m/mtd
+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:=d021e049efaff50de33819b8cd2835d4b79bcfa8
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

 PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
 PKG_CAT:=zcat
 
 PKG_MD5SUM:=1f42c2cae08eb9e7b52d0c188f8d6338
 PKG_CAT:=zcat
 

-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
 
 
 include $(INCLUDE_DIR)/host-build.mk
 


@@ -23,15 +26,29 @@ ifneq ($(HOST_OS),Linux)
 CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h
 endif
 
 CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.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) \
+               $(MTD_MAKEOPTS) \
+               TARGETS=mkfs.jffs2
+       $(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \
+               $(MTD_MAKEOPTS) \
+               TARGETS=ubinize

 endef
 
 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)/ubinize \
+               $(STAGING_DIR_HOST)/bin/

 endef
 
 endef
 

-define Build/Clean
+define Host/Clean

        rm -f $(STAGING_DIR_HOST)/bin/mkfs.jffs2
 endef
 
        rm -f $(STAGING_DIR_HOST)/bin/mkfs.jffs2
 endef