sync with whiterussian

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1923 3c298f89-4303-0410-b956-a3cf2f4a3e73

package/mtd/Config.in

@@ -1,7 +1,12 @@
 config BR2_PACKAGE_MTD
-	tristate "mtd - flash utility (always needed)"
+	tristate "mtd - update utility for trx firmware images"
 	default y
 	help
-	 flash utility for firmware images update. 
-	 OpenWrt will not work correctly without it.
+	 update utility for trx firmware images.
 
+config BR2_PACKAGE_MTD_STATIC
+	tristate "mtd - update utility for trx firmware images (statically linked)"
+	default n
+	help
+	 update utility for trx firmware images (statically linked). To update
+	 from other firmware or older OpenWrt releases.

package/mtd/Makefile

@@ -3,13 +3,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME := mtd
-PKG_RELEASE := 1
+PKG_RELEASE := 2
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
 
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,MTD,$(PKG_NAME),$(PKG_RELEASE),$(ARCH)))
+$(eval $(call PKG_template,MTD_STATIC,mtd-static,$(PKG_RELEASE),$(ARCH)))
 
 $(PKG_BUILD_DIR)/.prepared:
 	mkdir -p $@
@@ -17,6 +18,7 @@ $(PKG_BUILD_DIR)/.prepared:
 
 $(PKG_BUILD_DIR)/.built:
 	$(TARGET_CC) $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mtd mtd.c
+	$(TARGET_CC) -static $(TARGET_CFLAGS) -o $(PKG_BUILD_DIR)/mtd-static mtd.c
 	touch $@
 
 $(IPKG_MTD): 
@@ -24,3 +26,9 @@ $(IPKG_MTD):
 	install -m0755 $(PKG_BUILD_DIR)/mtd $(IDIR_MTD)/sbin
 	$(RSTRIP) $(IDIR_MTD)/sbin/*
 	$(IPKG_BUILD) $(IDIR_MTD) $(PACKAGE_DIR)
+
+$(IPKG_MTD_STATIC): 
+	install -d -m0755 $(IDIR_MTD_STATIC)/sbin
+	install -m0755 $(PKG_BUILD_DIR)/mtd-static $(IDIR_MTD_STATIC)/sbin
+	$(RSTRIP) $(IDIR_MTD_STATIC)/sbin/*
+	$(IPKG_BUILD) $(IDIR_MTD_STATIC) $(PACKAGE_DIR)

package/mtd/ipkg/mtd-static.control

@@ -0,0 +1,6 @@
+Package: mtd-static
+Priority: optional
+Section: sys
+Maintainer: OpenWrt Developer <openwrt-devel@openwrt.org>
+Source: buildroot internal
+Description: Tool for modifying the flash chip (statically linked)