X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=utils%2Fmtd-utils%2FMakefile;h=7ff0dcfe2e3872e99be1e261a4e2b8d3347453c1;hb=c7be074b44b5fb9850e60d4352aeb442f2145a37;hp=04b7524794ab95173e7cf9aed47f7967200742d5;hpb=4cfe2447566493ba723aff9e6f4c35e6f180dc72;p=openwrt%2Fsvn-archive%2Farchive.git

diff --git a/utils/mtd-utils/Makefile b/utils/mtd-utils/Makefile
index 04b7524794..7ff0dcfe2e 100644
--- a/utils/mtd-utils/Makefile
+++ b/utils/mtd-utils/Makefile
@@ -1,5 +1,5 @@
-# 
-# Copyright (C) 2009-2010 OpenWrt.org
+#
+# Copyright (C) 2009-2013 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,44 +8,108 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mtd-utils
-PKG_REV:=a2d010f8fca904fffa3c6e5a5d148cc96a37a08a
-PKG_VERSION:=20090227
-PKG_RELEASE:=1
-PKG_INSTALL:=1
+PKG_REV:=ab8c6fb93ce9db0f09401c4b819b0b277dc00340
+PKG_VERSION:=1.5.0
+PKG_RELEASE:=2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_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_SOURCE_VERSION:=$(PKG_REV)
 
+PKG_INSTALL:=1
+
+PKG_BUILD_DEPENDS:=util-linux
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/mtd-utils
+FILES:= \
+	doc_loadbios \
+	docfdisk \
+	flash_erase \
+	flash_eraseall:+mtd-utils-flash-erase \
+	flash_lock \
+	flash_otp_dump \
+	flash_otp_lock \
+	flash_otp_write \
+	flash_unlock \
+	flashcp \
+	ftl_check \
+	ftl_format \
+	jffs2dump \
+	jffs2reader:+zlib \
+	mkfs.jffs2:+zlib \
+	mkfs.ubifs:+libuuid:+liblzo:+zlib \
+	mtd_debug \
+	mtdinfo \
+	nanddump \
+	nandtest \
+	nandwrite \
+	nftldump \
+	nftl_format \
+	recv_image \
+	rfddump \
+	rfdformat \
+	serve_image \
+	sumtool \
+	ubiattach \
+	ubicrc32 \
+	ubidetach \
+	ubiformat \
+	ubimkvol \
+	ubinfo \
+	ubinize \
+	ubirename \
+	ubirmvol \
+	ubirsvol \
+	ubiupdatevol
+
+define PartGen
+define Package/mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(1))))
+  TITLE:=$(firstword $(subst :, ,$(1))) package from mtd-utils
+  URL:=http://www.linux-mtd.infradead.org/
   SECTION:=utils
   CATEGORY:=Utilities
+  DEPENDS:=mtd-utils $(wordlist 2,$(words $(subst :, ,$(1))),$(subst :, ,$(1)))
+endef
+endef
+
+define Package/mtd-utils
   TITLE:=Utilities for flash info/debug
+  SECTION:=utils
+  CATEGORY:=Utilities
   URL:=http://www.linux-mtd.infradead.org/
-  DEPENDS:=+zlib +liblzo +libuuid
+  MENU:=1
 endef
 
 define Package/mtd-utils/description
   Utilities for manipulating memory technology devices.
 endef
 
+define Package/mtd-utils/install
+	true
+endef
+
+$(foreach file,$(FILES),$(eval $(call PartGen,$(file))))
+
 MAKE_FLAGS += \
 	DESTDIR="$(PKG_INSTALL_DIR)" \
 	BUILDDIR="$(PKG_BUILD_DIR)" \
-	WITHOUT_XATTR=1
+	LDLIBS+="$(LIBGCC_S)" \
+	WITHOUT_XATTR=1 \
+	WITHOUT_LZO=1
 
-ifeq ($(CONFIG_LINUX_2_4),y)
-MAKE_FLAGS += \
-	SUBDIRS=""
-endif
-
-define Package/mtd-utils/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/* $(1)/usr/sbin/
+define PartInstall
+define Package/mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(1))))/install
+	$(INSTALL_DIR) $$(1)/usr/sbin
+	$(INSTALL_BIN) \
+		$(PKG_INSTALL_DIR)/usr/sbin/$(firstword $(subst :, ,$(1))) \
+		$$(1)/usr/sbin/
 endef
+endef
+
+$(foreach file,$(FILES),$(eval $(call PartInstall,$(file))))
 
 $(eval $(call BuildPackage,mtd-utils))
+$(foreach file,$(FILES),$(eval $(call BuildPackage,mtd-utils-$(subst _,-,$(firstword $(subst :, ,$(file)))))))