summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--package/busybox/patches/170-udhcp-options.patch15
-rw-r--r--package/mtd/Config.in11
-rw-r--r--package/mtd/Makefile10
-rw-r--r--package/mtd/ipkg/mtd-static.control6
4 files changed, 38 insertions, 4 deletions
diff --git a/package/busybox/patches/170-udhcp-options.patch b/package/busybox/patches/170-udhcp-options.patch
new file mode 100644
index 0000000000..b03810adf5
--- /dev/null
+++ b/package/busybox/patches/170-udhcp-options.patch
@@ -0,0 +1,15 @@
+diff -Nur busybox-1.00.orig/networking/udhcp/options.c busybox-1.00/networking/udhcp/options.c
+--- busybox-1.00.orig/networking/udhcp/options.c 2004-03-15 09:29:01.000000000 +0100
++++ busybox-1.00/networking/udhcp/options.c 2005-09-14 13:27:23.792609800 +0200
+@@ -39,8 +39,11 @@
+ {"dhcptype", OPTION_U8, 0x35},
+ {"serverid", OPTION_IP, 0x36},
+ {"message", OPTION_STRING, 0x38},
++ {"vendorclass", OPTION_STRING, 0x3C},
++ {"clientid", OPTION_STRING, 0x3D},
+ {"tftp", OPTION_STRING, 0x42},
+ {"bootfile", OPTION_STRING, 0x43},
++ {"userclass", OPTION_STRING, 0x4D},
+ {"", 0x00, 0x00}
+ };
+
diff --git a/package/mtd/Config.in b/package/mtd/Config.in
index 6ddc33be4e..a1b24a9358 100644
--- a/package/mtd/Config.in
+++ b/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.
diff --git a/package/mtd/Makefile b/package/mtd/Makefile
index bfbb301e4c..18ebc90335 100644
--- a/package/mtd/Makefile
+++ b/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)
diff --git a/package/mtd/ipkg/mtd-static.control b/package/mtd/ipkg/mtd-static.control
new file mode 100644
index 0000000000..5c73808ae0
--- /dev/null
+++ b/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)