[OpenWrt-Devel] [PATCH] mac80211: Update ath9k_htc firmware
Current ath9k_htc doesn't work anymore with the ar9271.fw and ar7010.fw firmware files. Hence, use the new renamed firmware htc_9271.fw and htc_7010.fw. This allows ath9k_htc to successfully load and operate. Signed-off-by: Helmut Schaa helmut.sc...@googlemail.com --- package/mac80211/Makefile | 23 +++ 1 files changed, 19 insertions(+), 4 deletions(-) diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index be35ad1..59d56fb 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -118,6 +118,9 @@ P54PCIFW:=2.13.12.0.arm P54USBFW:=2.13.24.0.lm87.arm P54SPIFW:=2.13.0.0.a.13.14.arm CARL9170_FW:=carl9170-1.fw +ATH9K_HTC_9271_FW:=htc_9271.fw +ATH9K_HTC_7010_FW:=htc_7010.fw +ATH9K_HTC_FW_VERSION:=1.3 define Download/p54usb FILE:=$(P54USBFW) @@ -147,6 +150,20 @@ define Download/carl9170 endef $(eval $(call Download,carl9170)) +define Download/ath9k-htc-9271 + FILE:=$(ATH9K_HTC_9271_FW) + URL:=http://linuxwireless.org/download/htc_fw/$(ATH9K_HTC_FW_VERSION) + MD5SUM:=76c902360ef8a095133258fd0d287292 +endef +$(eval $(call Download,ath9k-htc-9271)) + +define Download/ath9k-htc-7010 + FILE:=$(ATH9K_HTC_7010_FW) + URL:=http://linuxwireless.org/download/htc_fw/$(ATH9K_HTC_FW_VERSION) + MD5SUM:=23b4b8f235ab44452a109e8be2756134 +endef +$(eval $(call Download,ath9k-htc-7010)) + define KernelPackage/p54/Default $(call KernelPackage/mac80211/Default) TITLE:=Prism54 Drivers @@ -1319,10 +1336,8 @@ endef define KernelPackage/ath9k-htc/install $(INSTALL_DIR) $(1)/lib/firmware - $(INSTALL_DATA) \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ar9271.fw \ - $(PKG_BUILD_DIR)/$(PKG_LINUX_FIRMWARE_SUBDIR)/ar7010.fw \ - $(1)/lib/firmware/ + $(INSTALL_DATA) $(DL_DIR)/$(ATH9K_HTC_9271_FW) $(1)/lib/firmware/$(ATH9K_HTC_9271_FW) + $(INSTALL_DATA) $(DL_DIR)/$(ATH9K_HTC_7010_FW) $(1)/lib/firmware/$(ATH9K_HTC_7010_FW) endef define KernelPackage/mwl8k/install -- 1.7.3.4 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] New package PyRRD
This patch is a port of the PyRRD package to openwrt. PyRRD is a wrapper for rrdtool for python. The API is so much better than the python bindings for rrd. Signed-off-by: Roberto Riggio roberto.rig...@create-net.org --- Index: lang/pyrrd/patches/100-setuptools.patch === --- lang/pyrrd/patches/100-setuptools.patch (revision 0) +++ lang/pyrrd/patches/100-setuptools.patch (revision 0) @@ -0,0 +1,304 @@ +diff -urN PyRRD-0.1.0.old//ez_setup.py PyRRD-0.1.0//ez_setup.py +--- PyRRD-0.1.0.old//ez_setup.py 1970-01-01 01:00:00.0 +0100 PyRRD-0.1.0//ez_setup.py 2011-03-11 18:03:40.0 +0100 +@@ -0,0 +1,284 @@ ++#!python ++Bootstrap setuptools installation ++ ++If you want to use setuptools in your package's setup.py, just include this ++file in the same directory with it, and add this to the top of your setup.py:: ++ ++from ez_setup import use_setuptools ++use_setuptools() ++ ++If you want to require a specific version of setuptools, set a download ++mirror, or use an alternate download directory, you can do so by supplying ++the appropriate options to ``use_setuptools()``. ++ ++This file can also be run as a script to install or upgrade setuptools. ++ ++import sys ++DEFAULT_VERSION = 0.6c11 ++DEFAULT_URL = http://pypi.python.org/packages/%s/s/setuptools/; % sys.version[:3] ++ ++md5_data = { ++'setuptools-0.6b1-py2.3.egg': '8822caf901250d848b996b7f25c6e6ca', ++'setuptools-0.6b1-py2.4.egg': 'b79a8a403e4502fbb85ee3f1941735cb', ++'setuptools-0.6b2-py2.3.egg': '5657759d8a6d8fc44070a9d07272d99b', ++'setuptools-0.6b2-py2.4.egg': '4996a8d169d2be661fa32a6e52e4f82a', ++'setuptools-0.6b3-py2.3.egg': 'bb31c0fc7399a63579975cad9f5a0618', ++'setuptools-0.6b3-py2.4.egg': '38a8c6b3d6ecd22247f179f7da669fac', ++'setuptools-0.6b4-py2.3.egg': '62045a24ed4e1ebc77fe039aa4e6f7e5', ++'setuptools-0.6b4-py2.4.egg': '4cb2a185d228dacffb2d17f103b3b1c4', ++'setuptools-0.6c1-py2.3.egg': 'b3f2b5539d65cb7f74ad79127f1a908c', ++'setuptools-0.6c1-py2.4.egg': 'b45adeda0667d2d2ffe14009364f2a4b', ++'setuptools-0.6c10-py2.3.egg': 'ce1e2ab5d3a0256456d9fc13800a7090', ++'setuptools-0.6c10-py2.4.egg': '57d6d9d6e9b80772c59a53a8433a5dd4', ++'setuptools-0.6c10-py2.5.egg': 'de46ac8b1c97c895572e5e8596aeb8c7', ++'setuptools-0.6c10-py2.6.egg': '58ea40aef06da02ce641495523a0b7f5', ++'setuptools-0.6c11-py2.3.egg': '2baeac6e13d414a9d28e7ba5b5a596de', ++'setuptools-0.6c11-py2.4.egg': 'bd639f9b0eac4c42497034dec2ec0c2b', ++'setuptools-0.6c11-py2.5.egg': '64c94f3bf7a72a13ec83e0b24f2749b2', ++'setuptools-0.6c11-py2.6.egg': 'bfa92100bd772d5a213eedd356d64086', ++'setuptools-0.6c2-py2.3.egg': 'f0064bf6aa2b7d0f3ba0b43f20817c27', ++'setuptools-0.6c2-py2.4.egg': '616192eec35f47e8ea16cd6a122b7277', ++'setuptools-0.6c3-py2.3.egg': 'f181fa125dfe85a259c9cd6f1d7b78fa', ++'setuptools-0.6c3-py2.4.egg': 'e0ed74682c998bfb73bf803a50e7b71e', ++'setuptools-0.6c3-py2.5.egg': 'abef16fdd61955514841c7c6bd98965e', ++'setuptools-0.6c4-py2.3.egg': 'b0b9131acab32022bfac7f44c5d7971f', ++'setuptools-0.6c4-py2.4.egg': '2a1f9656d4fbf3c97bf946c0a124e6e2', ++'setuptools-0.6c4-py2.5.egg': '8f5a052e32cdb9c72bcf4b5526f28afc', ++'setuptools-0.6c5-py2.3.egg': 'ee9fd80965da04f2f3e6b3576e9d8167', ++'setuptools-0.6c5-py2.4.egg': 'afe2adf1c01701ee841761f5bcd8aa64', ++'setuptools-0.6c5-py2.5.egg': 'a8d3f61494ccaa8714dfed37bccd3d5d', ++'setuptools-0.6c6-py2.3.egg': '35686b78116a668847237b69d549ec20', ++'setuptools-0.6c6-py2.4.egg': '3c56af57be3225019260a644430065ab', ++'setuptools-0.6c6-py2.5.egg': 'b2f8a7520709a5b34f80946de5f02f53', ++'setuptools-0.6c7-py2.3.egg': '209fdf9adc3a615e5115b725658e13e2', ++'setuptools-0.6c7-py2.4.egg': '5a8f954807d46a0fb67cf1f26c55a82e', ++'setuptools-0.6c7-py2.5.egg': '45d2ad28f9750e7434111fde831e8372', ++'setuptools-0.6c8-py2.3.egg': '50759d29b349db8cfd807ba8303f1902', ++'setuptools-0.6c8-py2.4.egg': 'cba38d74f7d483c06e9daa6070cce6de', ++'setuptools-0.6c8-py2.5.egg': '1721747ee329dc150590a58b3e1ac95b', ++'setuptools-0.6c9-py2.3.egg': 'a83c4020414807b496e4cfbe08507c03', ++'setuptools-0.6c9-py2.4.egg': '260a2be2e5388d66bdaee06abec6342a', ++'setuptools-0.6c9-py2.5.egg': 'fe67c3e5a17b12c0e7c541b7ea43a8e6', ++'setuptools-0.6c9-py2.6.egg': 'ca37b1ff16fa2ede6e19383e7b59245a', ++} ++ ++import sys, os ++try: from hashlib import md5 ++except ImportError: from md5 import md5 ++ ++def _validate_md5(egg_name, data): ++if egg_name in md5_data: ++digest = md5(data).hexdigest() ++if digest != md5_data[egg_name]: ++print sys.stderr, ( ++md5 validation of %s failed! (Possible download problem?) ++% egg_name ++) ++sys.exit(2) ++return data ++ ++def use_setuptools( ++version=DEFAULT_VERSION, download_base=DEFAULT_URL, to_dir=os.curdir, ++
[OpenWrt-Devel] [PATCH] Bump simplejson version
Bump simplejson version Signed-off-by: Roberto Riggio roberto.rig...@create-net.org -- Index: lang/simplejson/Makefile === --- lang/simplejson/Makefile(revision 28398) +++ lang/simplejson/Makefile(working copy) @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=simplejson -PKG_VERSION:=2.1.6 +PKG_VERSION:=2.2.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/ -PKG_MD5SUM:=2f8351f6e6fe7ef25744805dfa56c0d5 +PKG_MD5SUM:=070c6467462bd63306f1756b01df6d70 PKG_BUILD_DEPENDS:=python include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] how to apply driver patch to the kernel
Ok. I have them as modules, not in one binary. So, this won't work i believe. But thanks for the information. Abhinav On Mon, Oct 10, 2011 at 1:25 AM, harish badrinath harishbadrin...@gmail.com wrote: Hello, @Harish : I am not sure how to trigger monolithic kernel, but i dont get any output of strings ... because vmlinux does not exist monolithic kernel ? option My way of saying .. if you compiled everything you needed into the kernel binary instead of compiling it as (optional) modules. strings vmlinux | grep abhinav Note: vmlinux is not vmlinuz .. find . -name vmlinux -exec strings {} \; | grep -i LINUX find . -name *.ko -exec strings {} \; | grep -i LINUX replace linux with your name or other notable string. Of course this assumes that you are doing this from openrwrt build root, in other words $PWD should be openwrt build root directory. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Current trunk fails to compile: mtd-utils patches failing
Any idea why my trunk/git snapshot fails to compile? $ make [...] make[3]: Entering directory `/home/stefan/openwrt/openwrt/tools/mtd-utils' . /home/stefan/openwrt/openwrt/include/shell.sh; gzip -dc /home/stefan/openwrt/openwrt/dl/mtd-20101124.tar.gz | /bin/tar -C /home/stefan/openwrt/openwrt/build_dir/host/mtd-20101124/.. -xf - Applying ./patches/000-upstream_jffs2reader.patch using plaintext: patching file jffs2reader.c Hunk #1 FAILED at 77. Hunk #2 FAILED at 136. Hunk #3 FAILED at 163. Hunk #4 FAILED at 188. Hunk #5 FAILED at 208. Hunk #6 FAILED at 344. Hunk #7 FAILED at 379. Hunk #8 FAILED at 817. Hunk #9 FAILED at 848. Hunk #10 FAILED at 896. 10 out of 10 hunks FAILED -- saving rejects to file jffs2reader.c.rej Patch failed! Please fix ./patches/000-upstream_jffs2reader.patch! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] mac80211: Update ath9k_htc firmware
On 10/10/2011 10:38 AM, Helmut Schaa wrote: Current ath9k_htc doesn't work anymore with the ar9271.fw and ar7010.fw firmware files. Hence, use the new renamed firmware htc_9271.fw and htc_7010.fw. This allows ath9k_htc to successfully load and operate. Signed-off-by: Helmut Schaa helmut.sc...@googlemail.com Hi Helmut, could you please try this patch, it just goes to a new version of linux-firmware which should contain the new firmware you need. Hauke diff --git a/package/mac80211/Makefile b/package/mac80211/Makefile index b706b21..05631c1 100644 --- a/package/mac80211/Makefile +++ b/package/mac80211/Makefile @@ -97,10 +97,11 @@ Generic IEEE 802.11 Networking Stack (mac80211) endef PKG_LINUX_FIRMWARE_NAME:=linux-firmware -PKG_LINUX_FIRMWARE_VERSION:=97649b1e5449029c845ebf7500e780a8867c3e89 +PKG_LINUX_FIRMWARE_VERSION:=d543c1d98fc240267ee59fff93f7a0f36d9e2fc3 PKG_LINUX_FIRMWARE_SOURCE:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION).tar.bz2 PKG_LINUX_FIRMWARE_PROTO:=git -PKG_LINUX_FIRMWARE_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +# PKG_LINUX_FIRMWARE_SOURCE_URL:=git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git +PKG_LINUX_FIRMWARE_SOURCE_URL:=git://git.infradead.org/users/dwmw2/linux-firmware.git PKG_LINUX_FIRMWARE_SUBDIR:=$(PKG_LINUX_FIRMWARE_NAME)-$(PKG_LINUX_FIRMWARE_VERSION) define Download/linux-firmware ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [patch] Update package mosquitto 0.12 - 0.13
Hi, Attached is a patch updating mosquitto (MQTT message broker, client tools, server, and client libraries) from version 0.12 to version 0.13 http://www.mosquitto.org for more info. Tested on atheros platforms for backfire. Signed-off-by: Karl Palsson ka...@tweak.net.au diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index 8f39a04..18a6ced 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mosquitto -PKG_VERSION:=0.12 +PKG_VERSION:=0.13 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://mosquitto.org/files/source/ -PKG_MD5SUM:=e21ecb18dc8f9c3103fab95bbf8cffc7 +PKG_MD5SUM:=e2cad39f430f91087cb9c248be26ece5 include $(INCLUDE_DIR)/package.mk ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] how to apply driver patch to the kernel
Are you building a new firmware image after recompiling mac80211? Rebuilding one package does not update the firmware image. Besides, using whole firmware images is a slow process... why not use the kmod-ath9k package (which is updated after you rebuild the package) and install it via opkg? Built packages are located in your bin/ dir. On Mon, Oct 10, 2011 at 8:30 AM, abhinav narain abhinavnarai...@gmail.comwrote: Ok. I have them as modules, not in one binary. So, this won't work i believe. But thanks for the information. Abhinav On Mon, Oct 10, 2011 at 1:25 AM, harish badrinath harishbadrin...@gmail.com wrote: Hello, @Harish : I am not sure how to trigger monolithic kernel, but i dont get any output of strings ... because vmlinux does not exist monolithic kernel ? option My way of saying .. if you compiled everything you needed into the kernel binary instead of compiling it as (optional) modules. strings vmlinux | grep abhinav Note: vmlinux is not vmlinuz .. find . -name vmlinux -exec strings {} \; | grep -i LINUX find . -name *.ko -exec strings {} \; | grep -i LINUX replace linux with your name or other notable string. Of course this assumes that you are doing this from openrwrt build root, in other words $PWD should be openwrt build root directory. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] Include all libraries with libevent
libevent provides some extra libraries (libevent-core and libevent-extra) which are not included in the current package. Some packages - like the one I'm working on - may depend on these, so it would be nice if they were included. Some symlinks are also missing in the current package. Signed-off-by: Espen Jürgensen espenjurgen...@gmail.com --- Index: packages/libs/libevent/Makefile === --- packages/libs/libevent/Makefile (revision 28407) +++ packages/libs/libevent/Makefile (working copy) @@ -9,7 +9,7 @@ PKG_NAME:=libevent PKG_VERSION:=1.4.14b -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz @@ -54,13 +54,17 @@ $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{la,a,so} $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent* $(1)/usr/lib/ endef define Package/libevent/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_core-1.4.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_extra-1.4.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_core.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent_extra.so $(1)/usr/lib/ endef $(eval $(call BuildPackage,libevent)) ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] how to apply driver patch to the kernel
yes I was deploying the firmware again on the machine after doing make package/mac80211/update. Also, there was no info on packages page that one has to do make package/mac80211/compile ? I was interested in knowing do I have to change anything in makefiles if I add another header file in the folder as a part of patch ? or is it that if a corresponding .c file is present, its .h file is taken by default(as in usual make) ? Abhinav On Mon, Oct 10, 2011 at 4:00 PM, Adam Porter porter.a...@gmail.com wrote: Are you building a new firmware image after recompiling mac80211? Rebuilding one package does not update the firmware image. Besides, using whole firmware images is a slow process... why not use the kmod-ath9k package (which is updated after you rebuild the package) and install it via opkg? Built packages are located in your bin/ dir. On Mon, Oct 10, 2011 at 8:30 AM, abhinav narain abhinavnarai...@gmail.com wrote: Ok. I have them as modules, not in one binary. So, this won't work i believe. But thanks for the information. Abhinav On Mon, Oct 10, 2011 at 1:25 AM, harish badrinath harishbadrin...@gmail.com wrote: Hello, @Harish : I am not sure how to trigger monolithic kernel, but i dont get any output of strings ... because vmlinux does not exist monolithic kernel ? option My way of saying .. if you compiled everything you needed into the kernel binary instead of compiling it as (optional) modules. strings vmlinux | grep abhinav Note: vmlinux is not vmlinuz .. find . -name vmlinux -exec strings {} \; | grep -i LINUX find . -name *.ko -exec strings {} \; | grep -i LINUX replace linux with your name or other notable string. Of course this assumes that you are doing this from openrwrt build root, in other words $PWD should be openwrt build root directory. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] update iptables to 1.4.12.1
--- package/iptables/Makefile |6 +- .../patches/010-multiport-linux-2.4-compat.patch | 265 package/iptables/patches/011-recent-add-reap.patch | 116 - .../patches/020-iptables-disable-modprobe.patch|8 +- package/iptables/patches/100-bash-location.patch | 12 +- 5 files changed, 9 insertions(+), 398 deletions(-) delete mode 100644 package/iptables/patches/010-multiport-linux-2.4-compat.patch delete mode 100644 package/iptables/patches/011-recent-add-reap.patch diff --git a/package/iptables/Makefile b/package/iptables/Makefile index 67dedca..7c7d466 100644 --- a/package/iptables/Makefile +++ b/package/iptables/Makefile @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=iptables -PKG_VERSION:=1.4.10 -PKG_RELEASE:=4 +PKG_VERSION:=1.4.12.1 +PKG_RELEASE:=1 -PKG_MD5SUM:=f382fe693f0b59d87bd47bea65eca198 +PKG_MD5SUM:=b08a1195ec2c1ebeaf072db3c55fdf43 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ diff --git a/package/iptables/patches/010-multiport-linux-2.4-compat.patch b/package/iptables/patches/010-multiport-linux-2.4-compat.patch deleted file mode 100644 index 3b35f7e..000 --- a/package/iptables/patches/010-multiport-linux-2.4-compat.patch +++ /dev/null @@ -1,265 +0,0 @@ a/extensions/libxt_multiport.c -+++ b/extensions/libxt_multiport.c -@@ -15,21 +15,6 @@ - #include linux/netfilter/xt_multiport.h - - /* Function which prints out usage message. */ --static void multiport_help(void) --{ -- printf( --multiport match options:\n -- --source-ports port[,port,port...]\n -- --sports ...\n -- match source port(s)\n -- --destination-ports port[,port,port...]\n -- --dports ...\n -- match destination port(s)\n -- --ports port[,port,port]\n -- match both source and destination port(s)\n -- NOTE: this kernel does not support port ranges in multiport.\n); --} -- - static void multiport_help_v1(void) - { - printf( -@@ -72,26 +57,6 @@ proto_to_name(u_int8_t proto) - } - } - --static unsigned int --parse_multi_ports(const char *portstring, u_int16_t *ports, const char *proto) --{ -- char *buffer, *cp, *next; -- unsigned int i; -- -- buffer = strdup(portstring); -- if (!buffer) xtables_error(OTHER_PROBLEM, strdup failed); -- -- for (cp=buffer, i=0; cp iXT_MULTI_PORTS; cp=next,i++) -- { -- next=strchr(cp, ','); -- if (next) *next++='\0'; -- ports[i] = xtables_parse_port(cp, proto); -- } -- if (cp) xtables_error(PARAMETER_PROBLEM, too many ports specified); -- free(buffer); -- return i; --} -- - static void - parse_multi_ports_v1(const char *portstring, -struct xt_multiport_v1 *multiinfo, -@@ -155,73 +120,6 @@ check_proto(u_int16_t pnum, u_int8_t inv - /* Function which parses command options; returns true if it -ate an option */ - static int --__multiport_parse(int c, char **argv, int invert, unsigned int *flags, -- struct xt_entry_match **match, u_int16_t pnum, -- u_int8_t invflags) --{ -- const char *proto; -- struct xt_multiport *multiinfo -- = (struct xt_multiport *)(*match)-data; -- -- switch (c) { -- case '1': -- xtables_check_inverse(optarg, invert, optind, 0, argv); -- proto = check_proto(pnum, invflags); -- multiinfo-count = parse_multi_ports(optarg, -- multiinfo-ports, proto); -- multiinfo-flags = XT_MULTIPORT_SOURCE; -- break; -- -- case '2': -- xtables_check_inverse(optarg, invert, optind, 0, argv); -- proto = check_proto(pnum, invflags); -- multiinfo-count = parse_multi_ports(optarg, -- multiinfo-ports, proto); -- multiinfo-flags = XT_MULTIPORT_DESTINATION; -- break; -- -- case '3': -- xtables_check_inverse(optarg, invert, optind, 0, argv); -- proto = check_proto(pnum, invflags); -- multiinfo-count = parse_multi_ports(optarg, -- multiinfo-ports, proto); -- multiinfo-flags = XT_MULTIPORT_EITHER; -- break; -- -- default: -- return 0; -- } -- -- if (invert) -- xtables_error(PARAMETER_PROBLEM, -- multiport does not support invert); -- -- if (*flags) -- xtables_error(PARAMETER_PROBLEM, -- multiport can only have one option); -- *flags = 1; -- return 1; --} -- --static int --multiport_parse(int c, char **argv, int invert,
Re: [OpenWrt-Devel] Current trunk fails to compile: mtd-utils patches failing
000-upstream_jffs2reader.patch and 000-upstream_nanddump.patch base on the prvious version of mtd (20101002). both patches were removed in r24129 updating mtd to 20101124. On 10/10/2011 06:47 PM, Stefan Tomanek wrote: Any idea why my trunk/git snapshot fails to compile? $ make [...] make[3]: Entering directory `/home/stefan/openwrt/openwrt/tools/mtd-utils' . /home/stefan/openwrt/openwrt/include/shell.sh; gzip -dc /home/stefan/openwrt/openwrt/dl/mtd-20101124.tar.gz | /bin/tar -C /home/stefan/openwrt/openwrt/build_dir/host/mtd-20101124/.. -xf - Applying ./patches/000-upstream_jffs2reader.patch using plaintext: patching file jffs2reader.c Hunk #1 FAILED at 77. Hunk #2 FAILED at 136. Hunk #3 FAILED at 163. Hunk #4 FAILED at 188. Hunk #5 FAILED at 208. Hunk #6 FAILED at 344. Hunk #7 FAILED at 379. Hunk #8 FAILED at 817. Hunk #9 FAILED at 848. Hunk #10 FAILED at 896. 10 out of 10 hunks FAILED -- saving rejects to file jffs2reader.c.rej Patch failed! Please fix ./patches/000-upstream_jffs2reader.patch! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] how to apply driver patch to the kernel
On Tue, Oct 11, 2011 at 3:55 AM, abhinav narain abhinavnarai...@gmail.com wrote: I was interested in knowing do I have to change anything in makefiles if I add another header file in the folder as a part of patch ? or is it that if a corresponding .c file is present, its .h file is taken by default(as in usual make) ? It depends on the patch. If it include header files in directories not included in the current include path, do yo have to link with new libraries,etc. It also in part depends on how the make file was written. (Do you have to add a new phony target, update file dependency,etc). ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel