diff options
| author | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-14 15:30:53 +0000 |
|---|---|---|
| committer | wbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2005-09-14 15:30:53 +0000 |
| commit | 427de2d3a514cfb5d3bc1bc68431dfa6c864c179 (patch) | |
| tree | 83f120ba347abc842f42e76bfb9f931500756e52 | |
| parent | 2901cbb0b79bcfe73ed88653e749698d23c99004 (diff) | |
sync with whiterussian
git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1923 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/busybox/patches/170-udhcp-options.patch | 15 | ||||
| -rw-r--r-- | package/mtd/Config.in | 11 | ||||
| -rw-r--r-- | package/mtd/Makefile | 10 | ||||
| -rw-r--r-- | package/mtd/ipkg/mtd-static.control | 6 |
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 000000000..b03810adf --- /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 6ddc33be4..a1b24a935 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 bfbb301e4..18ebc9033 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 000000000..5c73808ae --- /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) |