[OpenWrt-Devel] [PATCH] tools/patch: apply upstream patch for CVE-2019-13636
In GNU patch through 2.7.6, the following of symlinks is mishandled in certain cases other than input files. This affects inp.c and util.c. https://nvd.nist.gov/vuln/detail/CVE-2019-13636 Signed-off-by: Russell Senior --- tools/patch/Makefile | 2 +- tools/patch/patches/050-CVE-2019-13636.patch | 108 +++ 2 files changed, 109 insertions(+), 1 deletion(-) create mode 100644 tools/patch/patches/050-CVE-2019-13636.patch diff --git a/tools/patch/Makefile b/tools/patch/Makefile index cab9fee9f6..3bcf668b04 100644 --- a/tools/patch/Makefile +++ b/tools/patch/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patch PKG_VERSION:=2.7.6 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_CPE_ID:=cpe:/a:gnu:patch PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz diff --git a/tools/patch/patches/050-CVE-2019-13636.patch b/tools/patch/patches/050-CVE-2019-13636.patch new file mode 100644 index 00..e62c3d4175 --- /dev/null +++ b/tools/patch/patches/050-CVE-2019-13636.patch @@ -0,0 +1,108 @@ +From dce4683cbbe107a95f1f0d45fabc304acfb5d71a Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Mon, 15 Jul 2019 16:21:48 +0200 +Subject: Don't follow symlinks unless --follow-symlinks is given + +* src/inp.c (plan_a, plan_b), src/util.c (copy_to_fd, copy_file, +append_to_file): Unless the --follow-symlinks option is given, open files with +the O_NOFOLLOW flag to avoid following symlinks. So far, we were only doing +that consistently for input files. +* src/util.c (create_backup): When creating empty backup files, (re)create them +with O_CREAT | O_EXCL to avoid following symlinks in that case as well. +--- + src/inp.c | 12 ++-- + src/util.c | 14 +++--- + 2 files changed, 21 insertions(+), 5 deletions(-) + +diff --git a/src/inp.c b/src/inp.c +index 32d0919..22d7473 100644 +--- a/src/inp.c b/src/inp.c +@@ -238,8 +238,13 @@ plan_a (char const *filename) + { + if (S_ISREG (instat.st_mode)) + { +-int ifd = safe_open (filename, O_RDONLY|binary_transput, 0); ++int flags = O_RDONLY | binary_transput; + size_t buffered = 0, n; ++int ifd; ++ ++if (! follow_symlinks) ++ flags |= O_NOFOLLOW; ++ifd = safe_open (filename, flags, 0); + if (ifd < 0) + pfatal ("can't open file %s", quotearg (filename)); + +@@ -340,6 +345,7 @@ plan_a (char const *filename) + static void + plan_b (char const *filename) + { ++ int flags = O_RDONLY | binary_transput; + int ifd; + FILE *ifp; + int c; +@@ -353,7 +359,9 @@ plan_b (char const *filename) + + if (instat.st_size == 0) + filename = NULL_DEVICE; +- if ((ifd = safe_open (filename, O_RDONLY | binary_transput, 0)) < 0 ++ if (! follow_symlinks) ++flags |= O_NOFOLLOW; ++ if ((ifd = safe_open (filename, flags, 0)) < 0 + || ! (ifp = fdopen (ifd, binary_transput ? "rb" : "r"))) + pfatal ("Can't open file %s", quotearg (filename)); + if (TMPINNAME_needs_removal) +diff --git a/src/util.c b/src/util.c +index 1cc08ba..fb38307 100644 +--- a/src/util.c b/src/util.c +@@ -388,7 +388,7 @@ create_backup (char const *to, const struct stat *to_st, bool leave_original) + + try_makedirs_errno = ENOENT; + safe_unlink (bakname); +-while ((fd = safe_open (bakname, O_CREAT | O_WRONLY | O_TRUNC, 0666)) < 0) ++while ((fd = safe_open (bakname, O_CREAT | O_EXCL | O_WRONLY | O_TRUNC, 0666)) < 0) + { + if (errno != try_makedirs_errno) + pfatal ("Can't create file %s", quotearg (bakname)); +@@ -579,10 +579,13 @@ create_file (char const *file, int open_flags, mode_t mode, + static void + copy_to_fd (const char *from, int tofd) + { ++ int from_flags = O_RDONLY | O_BINARY; + int fromfd; + ssize_t i; + +- if ((fromfd = safe_open (from, O_RDONLY | O_BINARY, 0)) < 0) ++ if (! follow_symlinks) ++from_flags |= O_NOFOLLOW; ++ if ((fromfd = safe_open (from, from_flags, 0)) < 0) + pfatal ("Can't reopen file %s", quotearg (from)); + while ((i = read (fromfd, buf, bufsize)) != 0) + { +@@ -625,6 +628,8 @@ copy_file (char const *from, char const *to, struct stat *tost, + else + { + assert (S_ISREG (mode)); ++ if (! follow_symlinks) ++ to_flags |= O_NOFOLLOW; + tofd = create_file (to, O_WRONLY | O_BINARY | to_flags, mode, + to_dir_known_to_exist); + copy_to_fd (from, tofd); +@@ -640,9 +645,12 @@ copy_file (char const *from, char const *to, struct stat *tost, + void + append_to_file (char const *from, char const *to) + { ++ int to_flags = O_WRONLY | O_APPEND | O_BINARY; + int tofd; + +- if ((tofd = safe_open (to, O_WRONLY | O_BINARY | O_APPEND, 0)) < 0) ++ if (! follow_symlinks) ++to_flags |= O_NOFOLLOW; ++ if ((tofd = safe_open (to, to_flags, 0)) < 0) + pfatal ("Can't reopen file
[OpenWrt-Devel] [PATCH] tools/scons: update scons to 3.1.0
Needed to build gpsd again, which is required by olsrd. Signed-off-by: Russell Senior --- tools/scons/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/scons/Makefile b/tools/scons/Makefile index 5ec6554165..931b662f95 100644 --- a/tools/scons/Makefile +++ b/tools/scons/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=scons -PKG_VERSION:=3.0.5 +PKG_VERSION:=3.1.0 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/scons \ http://fossies.org/linux/misc/ -PKG_HASH:=df676f23dc6d4bfa384fc389d95dcd21ab907e6349d4c848958ba4befb73c73e +PKG_HASH:=f3f548d738d4a2179123ecd744271ec413b2d55735ea7625a59b1b59e6cd132f include $(INCLUDE_DIR)/host-build.mk -- 2.22.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] dnsmasq not leasing after a while. Sometimes more than 5 times a day
>>>>> "Denis" == Denis Periša writes: Denis> There is no other dhcp in network, it's routed connection RB435G Denis> with multiple cards wlan. this is config example: Denis> interface=eth0 except-interface=eth1 interface=wlan3 Denis> interface=wlan0 interface=wlan1 interface=wlan2 Denis> dhcp-range=172.17.3.20,172.17.3.253,255.255.255.0,1h Denis> dhcp-range=172.17.4.20,172.17.4.253,255.255.255.0,1h Denis> dhcp-range=172.17.5.20,172.17.5.253,255.255.255.0,1h Denis> dhcp-range=172.17.6.20,172.17.6.253,255.255.255.0,1h Denis> dhcp-range=172.17.7.20,172.17.7.253,255.255.255.0,1h From experience, sometimes there are DHCP servers you don't know about. This is what I see in my test bed: # cat /var/etc/dnsmasq.conf.cfg01411c # auto-generated config file from /etc/config/dhcp conf-file=/etc/dnsmasq.conf dhcp-authoritative read-ethers enable-ubus bind-dynamic local-service domain=localnet server=/lan/ except-interface=eth1 dhcp-leasefile=/tmp/dhcp.leases resolv-file=/tmp/resolv.conf.auto dhcp-broadcast=tag:needs-broadcast addn-hosts=/tmp/hosts conf-dir=/tmp/dnsmasq.d user=dnsmasq group=dnsmasq dhcp-ignore-names=tag:dhcp_bogus_hostname conf-file=/usr/share/dnsmasq/dhcpbogushostname.conf dhcp-range=set:pub,10.11.24.5,10.11.24.30,255.255.255.224,1h no-dhcp-interface=eth1 dhcp-range=set:priv,192.168.11.100,192.168.11.249,255.255.255.0,12h Try turning on the force option. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ath79: add support for tplink tl-wdr3600 modified with 16M flash
To modify a WDR3600 with 16MB flash, you will need an external SPI programmer and soldering tools. First, obtain a copy of the starting contents either with the external programmer or from commands in OpenWrt: # dd if=/dev/mtdblock0 of=/tmp/uboot.img # dd if=/dev/mtdblock1 of=/tmp/firmware.img # dd if=/dev/mtdblock5 of=/tmp/art.img Copy the files off the router. In order to make clean reads/writes with the external SPI programmer, it is helpful to hold the CPU in reset. To do this, solder a shunt across R2 near the JTAG header so that a jumper between pin 10 and pin 11 of the JTAG header can hold the RESET pin low. It is probabaly worth trying out your external SPI programmer by reading a few copies before desoldering the original flash part. Desolder the SPI flash in the middle of the board. Solder on the new one, noting the correct orientation. Build the pepe2k u-boot for the WDR3600 (branch with support added): $ git clone https://github.com/RussellSenior/u-boot_mod/tree/add-wdr3600-16m $ make tp-link_tl-wdr3600_16m Extract the novel bits from your original uboot.img, thusly: $ dd if=uboot.img of=macaddr.bin bs=1 skip=130048 count=6 $ dd if=uboot.img of=model.bin bs=1 skip=130304 count=8 $ dd if=uboot.img of=pin.bin bs=1 skip=130560 count=8 $ dd if=/dev/zero bs=64k count=2 | tr '\000' '\377' > u-boot-new.img $ dd if=u-boot_mod.bin of=u-boot-new.img conv=notrunc $ dd if=macaddr.bin of=u-boot-new.img bs=1 count=6 seek=130048 conv=notrunc $ dd if=model.bin of=u-boot-new.img bs=1 count=8 seek=130304 conv=notrunc $ dd if=pin.bin of=u-boot-new.img bs=1 count=8 seek=130560 conv=notrunc where u-boot_mod.bin is the u-boot image built using the pepe2k tree with patches for the 16MB flash size. Compose a new 16MB image: $ dd if=/dev/zero bs=1M count=16 | tr '\000' '\377' > 16MB-new.img $ dd if=u-boot-new.img of=16MB-new.img conv=notrunc $ dd if=openwrt-ath79-generic-tplink_tl-wdr3600-16m-squashfs-sysupgrade.bin of=16MB-new.img bs=64k seek=2 conv=notrunc $ dd if=art.bin of=16MB-new.img bs=64k seek=255 conv=notrunc Then, use your external SPI flash programmer to write 16MB-new.img to the new flash part. Signed-off-by: Russell Senior --- .../ath79/base-files/etc/board.d/02_network | 1 + .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../dts/ar9344_tplink_tl-wdr3600-16m.dts | 46 +++ target/linux/ath79/image/generic-tp-link.mk | 10 4 files changed, 58 insertions(+) create mode 100644 target/linux/ath79/dts/ar9344_tplink_tl-wdr3600-16m.dts diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index e66eb938fd..5701372ed5 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -170,6 +170,7 @@ ath79_setup_interfaces() tplink,archer-c7-v4|\ tplink,archer-c7-v5|\ tplink,tl-wdr3600|\ + tplink,tl-wdr3600-16m|\ tplink,tl-wdr4300) ucidef_add_switch "switch0" \ "0@eth0" "2:lan:1" "3:lan:2" "4:lan:3" "5:lan:4" "1:wan" diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 84e4d07b35..40ea3f3a42 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -146,6 +146,7 @@ case "$FIRMWARE" in ;; ocedo,raccoon|\ tplink,tl-wdr3600|\ + tplink,tl-wdr3600-16m|\ tplink,tl-wdr4300|\ tplink,tl-wdr4900-v2|\ winchannel,wb2000) diff --git a/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600-16m.dts b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600-16m.dts new file mode 100644 index 00..ca8fd077e3 --- /dev/null +++ b/target/linux/ath79/dts/ar9344_tplink_tl-wdr3600-16m.dts @@ -0,0 +1,46 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar9344_tplink_tl-wdr4300.dtsi" + +/ { + model = "TP-Link WDR3600 16M"; + compatible = "tplink,tl-wdr3600-16m", "qca,ar9344"; +}; + + { + num-cs = <1>; + + status = "okay"; + + flash@0 { + compatible = "jedec,spi-nor"; + reg = <0>; + spi-max-frequency = <2500>; + + partitions { + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + uboot: partition@0 { + label = "u-boot"; + reg = <0x00 0x02>; + read-only; +
Re: [OpenWrt-Devel] Changes in support for Mikrotik RB493G
>>>>> "W" == W Michael Petullo writes: W> Changes in the last year or so have left me a little confused with W> the OpenWrt support for the Mikrotik RB493G. I generally compile my W> kernels and root disk images myself, namely by running "make W> menuconfig" and "make" in an OpenWrt source tree. I then go on to W> install the built artifacts by booting my router using TFTP and so W> on. W> [...] W> I suppose I am surprised that the OpenWrt build process does not W> build an UBIFS image as it does with tar.gz, ext4, and squashfs W> images. Am I missing something? In recent master branch, you can use sysupgrade. I scp the file, bin/targets/ar71xx/mikrotik/openwrt-ar71xx-mikrotik-nand-large-squashfs-sysupgrade.bin, to /tmp and run "sysupgrade -v -n" with that file. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: fix firmware compatible string for dir860l-b1
In commit d70ec3008d4cd0540a9f6c88fb7e786107f1679a, a firmware compatible string of "denx,uimage" was added for the Dlink DIR-860L-B1. Unfortunately, this was the wrong string. It needs "seama" instead. Signed-off-by: Russell Senior --- target/linux/ramips/dts/DIR-860L-B1.dts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/dts/DIR-860L-B1.dts b/target/linux/ramips/dts/DIR-860L-B1.dts index b8f6dc0784..a37d68ff3b 100644 --- a/target/linux/ramips/dts/DIR-860L-B1.dts +++ b/target/linux/ramips/dts/DIR-860L-B1.dts @@ -112,7 +112,7 @@ }; partition@5 { - compatible = "denx,uimage"; + compatible = "seama"; label = "firmware"; reg = <0x5 0xfb>; }; -- 2.19.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv2] ath79: add support for Ubiquiti AirRouter
On Mon, Nov 26, 2018 at 1:19 PM Russell Senior wrote: > > On Mon, Nov 26, 2018 at 5:16 AM Mathias Kresin wrote: > > > > Hey Russell, > > > > thanks for your patch. Find my remarks inline. > > > > Mathias > > > > [...] > > > > Wouldn't be the power led the more appropriate led for boot status > > indication? I would expect the globe led to be some kind of wan > > connectivity indication. > > There is a seperate LED that is associated with the WAN interface. > > > [...] > > > > Disabling the inherit led node and adding a new one makes it really hard > > to read and therefore to understand. > > > > Please do not include the ar7241_ubnt_xm.dtsi if it doesn't match. Maybe > > the ar7241_ubnt_xm.dtsi need to be split into multiple dtsi. > > I think all of the outdoor ubnt-xm devices have LEDs intended to > reflect signal strength. Would it make sense to create a dtsi for > ubnt_xm_outdoor, and include that appropriately? See v3, now in two commits, sent separately. ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCHv3 2/2] ath79: add support for Ubiquiti AirRouter
Indoor low-power router with 2.4 GHz radio CPU:Atheros AR7241 rev 1 RAM:32 MB Flash: 8 MB NOR SPI Switch: Atheros AR7240 Ports: 1x WAN, 4x LAN 10/100 Ethernet WLAN: Atheros AR9285 (2.4 GHz) USB:1x USB2 host port Note: Ethernet WAN/LAN port naming is reversed from ar71xx. WAN is eth0; LAN is eth1.1. UART settings: 115200, 8N1 LEDs +-- | | | | | | | | VCC | x x RX | * x | x x | x x TX | * x GND | * x | | | | +-- ETHERNET PORTS Installation from Ubiquiti firmware, is as for other ubnt-xm AirOs devices. Signed-off-by: Russell Senior --- .../ath79/base-files/etc/board.d/02_network | 3 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../linux/ath79/dts/ar7241_ubnt_airrouter.dts | 38 +++ target/linux/ath79/image/generic-ubnt.mk | 7 4 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 target/linux/ath79/dts/ar7241_ubnt_airrouter.dts diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index 202820d50b..5bb64d0a88 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -120,7 +120,8 @@ ath79_setup_interfaces() buffalo,whr-g301n|\ tplink,tl-mr3220-v1|\ tplink,tl-mr3420-v1|\ - tplink,tl-wr841-v7) + tplink,tl-wr841-v7|\ + ubnt,airrouter) ucidef_set_interface_wan "eth0" ucidef_add_switch "switch0" \ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 020abe2913..68f70174bb 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -141,6 +141,7 @@ case "$FIRMWARE" in tplink,tl-wr741-v1|\ tplink,tl-wr743nd-v1|\ tplink,tl-wr841-v7|\ + ubnt,airrouter|\ ubnt,bullet-m|\ ubnt,nano-m|\ ubnt,rocket-m) diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts new file mode 100644 index 00..fbe289f05a --- /dev/null +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -0,0 +1,38 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar7241_ubnt_xm.dtsi" + +/ { + compatible = "ubnt,airrouter", "qca,ar7241"; + model = "Ubiquiti AirRouter"; + + aliases { + led-boot = + led-failsafe = + led-running = + led-upgrade = + }; + + airrouter-leds { + compatible = "gpio-leds"; + + globe: globe { + label = "ubnt:green:globe"; + gpios = < 0 GPIO_ACTIVE_LOW>; + }; + + power { + label = "ubnt:green:power"; + gpios = < 11 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +_phy { +status = "okay"; +}; + + { +status = "okay"; +}; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index 66c16e44b0..88be9a78b4 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -78,6 +78,13 @@ define Device/ubnt-xw ATH_SOC := ar9342 endef +define Device/ubnt_airrouter + $(Device/ubnt-xm) + DEVICE_TITLE := Ubiquiti AirRouter + SUPPORTED_DEVICES += airrouter +endef +TARGET_DEVICES += ubnt_airrouter + define Device/ubnt_bullet-m $(Device/ubnt-xm) DEVICE_TITLE := Ubiquiti Bullet-M -- 2.19.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCHv3 1/2] ath79: split ubnt outdoor device leds into separate dtsi
Move common LED configuration into a separate includible dtsi. Signed-off-by: Russell Senior --- .../linux/ath79/dts/ar7241_ubnt_bullet-m.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt_nano-m.dts | 2 +- .../linux/ath79/dts/ar7241_ubnt_rocket-m.dts | 2 +- target/linux/ath79/dts/ar7241_ubnt_xm.dtsi| 28 --- .../ath79/dts/ar7241_ubnt_xm_outdoor.dtsi | 36 +++ 5 files changed, 39 insertions(+), 31 deletions(-) create mode 100644 target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts index 33790f2e1c..9298ef1c7d 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7241_ubnt_xm.dtsi" +#include "ar7241_ubnt_xm_outdoor.dtsi" / { compatible = "ubnt,bullet-m", "qca,ar7241"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts index 417e503127..bf6b868ef4 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7241_ubnt_xm.dtsi" +#include "ar7241_ubnt_xm_outdoor.dtsi" / { compatible = "ubnt,nano-m", "qca,ar7241"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts index 4053147c9c..8931d926cd 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts +++ b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts @@ -1,7 +1,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later OR MIT /dts-v1/; -#include "ar7241_ubnt_xm.dtsi" +#include "ar7241_ubnt_xm_outdoor.dtsi" / { compatible = "ubnt,rocket-m", "qca,ar7241"; diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi index f6cefdabd0..6a5e07caf7 100644 --- a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi +++ b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi @@ -9,11 +9,6 @@ compatible = "ubnt,xm", "qca,ar7241"; model = "Ubiquiti Networks XM (rev 1.0) board"; - aliases { - led-boot = - led-failsafe = - }; - /* extosc: ref { compatible = "fixed-clock"; #clock-cells = <0>; @@ -29,29 +24,6 @@ debounce-interval = <60>; }; }; - - leds { - compatible = "gpio-leds"; - link1 { - label = "ubnt:red:link1"; - gpios = < 0 GPIO_ACTIVE_HIGH>; - }; - - link2 { - label = "ubnt:orange:link2"; - gpios = < 1 GPIO_ACTIVE_HIGH>; - }; - - link3 { - label = "ubnt:green:link3"; - gpios = < 11 GPIO_ACTIVE_HIGH>; - }; - - link4: link4 { - label = "ubnt:green:link4"; - gpios = < 7 GPIO_ACTIVE_HIGH>; - }; - }; }; { diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi new file mode 100644 index 00..c773f1aac3 --- /dev/null +++ b/target/linux/ath79/dts/ar7241_ubnt_xm_outdoor.dtsi @@ -0,0 +1,36 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT + +#include +#include + +#include "ar7241_ubnt_xm.dtsi" + +/ { + aliases { + led-boot = + led-failsafe = + }; + + leds { + compatible = "gpio-leds"; + link1 { + label = "ubnt:red:link1"; + gpios = < 0 GPIO_ACTIVE_HIGH>; + }; + + link2 { + label = "ubnt:orange:link2"; + gpios = < 1 GPIO_ACTIVE_HIGH>; + }; + + link3 { + label = "ubnt:green:link3"; + gpios = < 11 GPIO_ACTIVE_HIGH>; + }; + + link4: link4 { + label = "ubnt:green:link4"; + gpios = < 7 GPIO_ACTIVE_HIGH>; + }; + }; +}; -- 2.19.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv2] ath79: add support for Ubiquiti AirRouter
On Mon, Nov 26, 2018 at 5:16 AM Mathias Kresin wrote: > > Hey Russell, > > thanks for your patch. Find my remarks inline. > > Mathias > > 26/11/2018 13:54, Russell Senior: > > > > Indoor low-power router with 2.4 GHz radio > > > > CPU:Atheros AR7241 rev 1 > > RAM:32 MB > > Flash: 8 MB NOR SPI > > Switch: Atheros AR7240 > > Ports: 1x WAN, 4x LAN 10/100 Ethernet > > WLAN: Atheros AR9285 (2.4 GHz) > > USB: 1x USB2 host port > > > > Note: Ethernet WAN/LAN port naming is reversed from ar71xx. > > WAN is eth0; LAN is eth1.1. > > > > UART settings: 115200, 8N1 > > > > LEDs > > +-- > > | > > | > > | > > | > > | > > | > > | > > | > > VCC | x x > > RX | * x > > | x x > > | x x > > TX | * x > > GND | * x > > | > > | > > | > > | > > +-- > > ETHERNET PORTS > > > > Installation from Ubiquiti firmware, is as for other ubnt-xm AirOs devices. > > > > Signed-off-by: Russell Senior > > --- > > .../ath79/base-files/etc/board.d/02_network | 3 +- > > .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + > > .../linux/ath79/dts/ar7241_ubnt_airrouter.dts | 42 +++ > > target/linux/ath79/image/generic-ubnt.mk | 7 > > 4 files changed, 52 insertions(+), 1 deletion(-) > > create mode 100644 target/linux/ath79/dts/ar7241_ubnt_airrouter.dts > > > > diff --git a/target/linux/ath79/base-files/etc/board.d/02_network > > b/target/linux/ath79/base-files/etc/board.d/02_network > > index 5f02c5769a..5fb0546d18 100755 > > --- a/target/linux/ath79/base-files/etc/board.d/02_network > > +++ b/target/linux/ath79/base-files/etc/board.d/02_network > > @@ -116,7 +116,8 @@ ath79_setup_interfaces() > > buffalo,whr-g301n|\ > > tplink,tl-mr3220-v1|\ > > tplink,tl-mr3420-v1|\ > > - tplink,tl-wr841-v7) > > + tplink,tl-wr841-v7|\ > > + ubnt,airrouter) > > ucidef_set_interface_wan "eth0" > > ucidef_add_switch "switch0" \ > > "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" > > diff --git > > a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom > > b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom > > index 020abe2913..68f70174bb 100644 > > --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom > > +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom > > @@ -141,6 +141,7 @@ case "$FIRMWARE" in > > tplink,tl-wr741-v1|\ > > tplink,tl-wr743nd-v1|\ > > tplink,tl-wr841-v7|\ > > + ubnt,airrouter|\ > > ubnt,bullet-m|\ > > ubnt,nano-m|\ > > ubnt,rocket-m) > > diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts > > b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts > > new file mode 100644 > > index 00..eecdf28108 > > --- /dev/null > > +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts > > @@ -0,0 +1,42 @@ > > +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT > > +/dts-v1/; > > + > > +#include "ar7241_ubnt_xm.dtsi" > > + > > +/ { > > + compatible = "ubnt,airrouter", "qca,ar7241"; > > + model = "Ubiquiti AirRouter"; > > + > > + aliases { > > + led-boot = > > + led-failsafe = > > + led-running = > > + led-upgrade = > > Wouldn't be the power led the more appropriate led for boot status > indication? I would expect the globe led to be some kind of wan > connectivity indication. There is a seperate LED that is associated with the WAN interface. > > > + }; > > + > > + leds { > > + status = "disabled"; > > + }; > > + > > + airrouter-leds { > > + compatible = "gpio-leds"; > > + > > + globe: globe { > > + label = "ubnt:green:globe"; > > + gpios = < 0 GPIO_ACTIVE_LOW>; > > + }; > > + > > + power { > > + label
[OpenWrt-Devel] [PATCH] ramips: fix alphabetic ordering of skylab, skw92a in ramips_setup_interfaces
Signed-off-by: Russell Senior --- target/linux/ramips/base-files/etc/board.d/02_network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 7bb1d32484..6f60683fc2 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -213,6 +213,7 @@ ramips_setup_interfaces() mzk-wdpr|\ rb750gr3|\ rt-n14u|\ + skylab,skw92a|\ tplink,c20-v4|\ tplink,c50-v3|\ tplink,tl-mr3420-v5|\ @@ -220,7 +221,6 @@ ramips_setup_interfaces() tl-wr840n-v4|\ tl-wr840n-v5|\ tl-wr841n-v13|\ - skylab,skw92a|\ u7628-01-128M-16M|\ ubnt-erx|\ ubnt-erx-sfp|\ -- 2.19.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCHv2] ath79: add support for Ubiquiti AirRouter
Indoor low-power router with 2.4 GHz radio CPU:Atheros AR7241 rev 1 RAM:32 MB Flash: 8 MB NOR SPI Switch: Atheros AR7240 Ports: 1x WAN, 4x LAN 10/100 Ethernet WLAN: Atheros AR9285 (2.4 GHz) USB:1x USB2 host port Note: Ethernet WAN/LAN port naming is reversed from ar71xx. WAN is eth0; LAN is eth1.1. UART settings: 115200, 8N1 LEDs +-- | | | | | | | | VCC | x x RX | * x | x x | x x TX | * x GND | * x | | | | +-- ETHERNET PORTS Installation from Ubiquiti firmware, is as for other ubnt-xm AirOs devices. Signed-off-by: Russell Senior --- .../ath79/base-files/etc/board.d/02_network | 3 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../linux/ath79/dts/ar7241_ubnt_airrouter.dts | 42 +++ target/linux/ath79/image/generic-ubnt.mk | 7 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 target/linux/ath79/dts/ar7241_ubnt_airrouter.dts diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index 5f02c5769a..5fb0546d18 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -116,7 +116,8 @@ ath79_setup_interfaces() buffalo,whr-g301n|\ tplink,tl-mr3220-v1|\ tplink,tl-mr3420-v1|\ - tplink,tl-wr841-v7) + tplink,tl-wr841-v7|\ + ubnt,airrouter) ucidef_set_interface_wan "eth0" ucidef_add_switch "switch0" \ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 020abe2913..68f70174bb 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -141,6 +141,7 @@ case "$FIRMWARE" in tplink,tl-wr741-v1|\ tplink,tl-wr743nd-v1|\ tplink,tl-wr841-v7|\ + ubnt,airrouter|\ ubnt,bullet-m|\ ubnt,nano-m|\ ubnt,rocket-m) diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts new file mode 100644 index 00..eecdf28108 --- /dev/null +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar7241_ubnt_xm.dtsi" + +/ { + compatible = "ubnt,airrouter", "qca,ar7241"; + model = "Ubiquiti AirRouter"; + + aliases { + led-boot = + led-failsafe = + led-running = + led-upgrade = + }; + + leds { + status = "disabled"; + }; + + airrouter-leds { + compatible = "gpio-leds"; + + globe: globe { + label = "ubnt:green:globe"; + gpios = < 0 GPIO_ACTIVE_LOW>; + }; + + power { + label = "ubnt:green:power"; + gpios = < 11 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +_phy { +status = "okay"; +}; + + { +status = "okay"; +}; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index bb86c8b288..a6d9b06332 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -63,6 +63,13 @@ define Device/ubnt-wa ATH_SOC := ar9342 endef +define Device/ubnt_airrouter + $(Device/ubnt-xm) + DEVICE_TITLE := Ubiquiti AirRouter + SUPPORTED_DEVICES += airrouter +endef +TARGET_DEVICES += ubnt_airrouter + define Device/ubnt_bullet-m $(Device/ubnt-xm) DEVICE_TITLE := Ubiquiti Bullet-M -- 2.19.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCHv3] ramips: add support for Skylab SKW92A in EVB
Specifically, SKW92A_E16, described here: http://www.skylabmodule.com/wp-content/uploads/SkyLab_SKW92A_V1.04_datasheet.pdf Specification: - MediaTek MT7628N/N (580 Mhz) - 64 MB of RAM - 16 MB of FLASH - 2T2R 2.4 GHz - 5x 10/100 Mbps Ethernet - 2x u.FL - Power by micro-USB connector at USB1 on EVB - UART via micro-USB connector at USB3 on EVB (57600 8n1) - 5x Ethernet LEDs - 1x WLAN LEDs - 1x WPS LED connected by jumper wire from I2S_CK on J20 to WPS_LED pin hole next to daughter board on EVB - WPS/Reset button (S2 on EVB) - RESET button (S1 on EVB) is *not* connected to RST hole next to daughter board Flash instruction: >From Skylab firmware: 1. Associate with SKYLAP_AP 2. In a browser, load: http://10.10.10.254/ 3. Username/password: admin/admin 4. In web admin interface: Administration / Upload Firmware, browse to sysupgrade image, apply, flash will fail with a message: Not a valid firmware. *** Warning: "/var/tmpFW" has corrupted data! 5. Telnet to 10.10.10.254, drops you into a root shell with no credentials 6. # cd /var 7. # mtd_write -r write tmpFW mtd4 Unlocking mtd4 ... Writing from tmpFW to mtd4 ... [e] 8. When flash has completed, you will have booted into your firmware. >From U-boot via TFTP and initramfs: 1. Place openwrt-ramips-mt76x8-skw92a-initramfs-kernel.bin on a TFTP server 2. Connect to serial console at USB3 on EVB 3. Connect ethernet between port 1 (not WAN) and your TFTP server (e.g. 192.168.11.20) 4. Start terminal software (e.g. screen /dev/ttyUSB0 57600) on PC 5. Apply power to EVB 6. Interrupt u-boot with keypress of "1" 7. At u-boot prompts: Input device IP (10.10.10.123) ==:192.168.11.21 Input server IP (10.10.10.3) ==:192.168.11.20 Input Linux Kernel filename (root_uImage) ==:openwrt-ramips-mt76x8-skw92a-initramfs-kernel.bin 8. Move ethernet to port 0 (WAN) on EVB 9. At new OpenWrt console shell, fetch squashfs-sysupgrade image and flash with sysupgrade. >From U-boot via TFTP direct flash: 1. Place openwrt-ramips-mt76x8-skw92a-squashfs-sysupgrade.bin on a TFTP server 2. Connect to serial console at USB3 on EVB (57600 8N1) 3. Connect ethernet between port 1 (not WAN) an your TFTP server (e.g. 192.168.11.20) 4. Start terminal software (e.g. screen /dev/ttyUSB0 57600) on PC 5. Apply power to EVB 6. Interrupt u-boot with keypress of "2" 7. At u-boot prompts: Warning!! Erase Linux in Flash then burn new one. Are you sure?(Y/N) Y Input device IP (10.10.10.123) ==:192.168.11.21 Input server IP (10.10.10.3) ==:192.168.11.20 Input Linux Kernel filename (root_uImage) ==:openwrt-ramips-mt76x8-skw92a-squashfs-sysupgrade.bin 8. When transfer is complete or as OpenWrt begins booting, move ethernet to port 0 (WAN). Signed-off-by: Russell Senior --- .../ramips/base-files/etc/board.d/01_leds | 3 + .../ramips/base-files/etc/board.d/02_network | 8 ++ target/linux/ramips/base-files/lib/ramips.sh | 3 + .../ramips/base-files/lib/upgrade/platform.sh | 1 + target/linux/ramips/dts/SKW92A.dts| 120 ++ target/linux/ramips/image/mt76x8.mk | 8 ++ 6 files changed, 143 insertions(+) create mode 100644 target/linux/ramips/dts/SKW92A.dts diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 2644bc0159..825a65b1d1 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -283,6 +283,9 @@ rt-n14u) ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" eth0.2 set_wifi_led "$boardname:blue:air" ;; +skw92a) + set_wifi_led "$boardname:green:wlan" + ;; tama,w06) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 9e9ecbcb51..ac9f368419 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -345,6 +345,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0" ;; + skw92a) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" + ;; tew-638apb-v2) ucidef_add_switch "switch0" \ "4:lan" "6@eth0" @@ -554,6 +558,10 @@ ramips_setup_macs() lan_mac
Re: [OpenWrt-Devel] [PATCHv2] ath79: add support for Ubiquiti AirRouter
Indoor low-power router with 2.4 GHz radio CPU:Atheros AR7241 rev 1 RAM:32 MB Flash: 8 MB NOR SPI Switch: Atheros AR7240 Ports: 1x WAN, 4x LAN 10/100 Ethernet WLAN: Atheros AR9285 (2.4 GHz) USB:1x USB2 host port Note: Ethernet WAN/LAN port naming is reversed from ar71xx. WAN is eth0; LAN is eth1.1. UART settings: 115200, 8N1 LEDs +-- | | | | | | | | VCC | x x RX | * x | x x | x x TX | * x GND | * x | | | | +-- ETHERNET PORTS Installation from Ubiquiti firmware, is as for other ubnt-xm AirOs devices. v2 adds some LED configuration in the device tree, cleans up some braindamage from v1. Signed-off-by: Russell Senior --- .../ath79/base-files/etc/board.d/02_network | 3 +- .../etc/hotplug.d/firmware/10-ath9k-eeprom| 1 + .../linux/ath79/dts/ar7241_ubnt_airrouter.dts | 42 +++ target/linux/ath79/image/generic-ubnt.mk | 7 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 target/linux/ath79/dts/ar7241_ubnt_airrouter.dts diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index 5f02c5769a..5fb0546d18 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -116,7 +116,8 @@ ath79_setup_interfaces() buffalo,whr-g301n|\ tplink,tl-mr3220-v1|\ tplink,tl-mr3420-v1|\ - tplink,tl-wr841-v7) + tplink,tl-wr841-v7|\ + ubnt,airrouter) ucidef_set_interface_wan "eth0" ucidef_add_switch "switch0" \ "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 020abe2913..68f70174bb 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -141,6 +141,7 @@ case "$FIRMWARE" in tplink,tl-wr741-v1|\ tplink,tl-wr743nd-v1|\ tplink,tl-wr841-v7|\ + ubnt,airrouter|\ ubnt,bullet-m|\ ubnt,nano-m|\ ubnt,rocket-m) diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts new file mode 100644 index 00..eecdf28108 --- /dev/null +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -0,0 +1,42 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar7241_ubnt_xm.dtsi" + +/ { + compatible = "ubnt,airrouter", "qca,ar7241"; + model = "Ubiquiti AirRouter"; + + aliases { + led-boot = + led-failsafe = + led-running = + led-upgrade = + }; + + leds { + status = "disabled"; + }; + + airrouter-leds { + compatible = "gpio-leds"; + + globe: globe { + label = "ubnt:green:globe"; + gpios = < 0 GPIO_ACTIVE_LOW>; + }; + + power { + label = "ubnt:green:power"; + gpios = < 11 GPIO_ACTIVE_HIGH>; + }; + }; +}; + +_phy { +status = "okay"; +}; + + { +status = "okay"; +}; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index bb86c8b288..a6d9b06332 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -63,6 +63,13 @@ define Device/ubnt-wa ATH_SOC := ar9342 endef +define Device/ubnt_airrouter + $(Device/ubnt-xm) + DEVICE_TITLE := Ubiquiti AirRouter + SUPPORTED_DEVICES += airrouter +endef +TARGET_DEVICES += ubnt_airrouter + define Device/ubnt_bullet-m $(Device/ubnt-xm) DEVICE_TITLE := Ubiquiti Bullet-M -- 2.19.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ath79: add support for Ubiquiti AirRouter
Indoor low-power router with 2.4 GHz radio CPU:Atheros AR7241 rev 1 RAM:32 MB Flash: 8 MB NOR SPI Switch: Atheros AR7240 Ports: 1x WAN, 4x LAN 10/100 Ethernet WLAN: Atheros AR9285 (2.4 GHz) USB:1x USB2 host port Note: Ethernet WAN/LAN port naming is reversed from ar71xx. WAN is eth0; LAN is eth1.1. UART settings: 115200, 8N1 LEDs +-- | | | | | | | | VCC | x x RX | * x | x x | x x TX | * x GND | * x | | | | +-- ETHERNET PORTS Installation from Ubiquiti firmware, is as for other ubnt-xm AirOs devices. Signed-off-by: Russell Senior --- .../linux/ath79/base-files/etc/board.d/01_leds | 2 ++ .../ath79/base-files/etc/board.d/02_network | 5 + .../etc/hotplug.d/firmware/10-ath9k-eeprom | 1 + .../linux/ath79/dts/ar7241_ubnt_airrouter.dts | 17 + target/linux/ath79/image/generic-ubnt.mk| 7 +++ 5 files changed, 32 insertions(+) create mode 100644 target/linux/ath79/dts/ar7241_ubnt_airrouter.dts diff --git a/target/linux/ath79/base-files/etc/board.d/01_leds b/target/linux/ath79/base-files/etc/board.d/01_leds index f04eb7f5c6..1343e03f90 100755 --- a/target/linux/ath79/base-files/etc/board.d/01_leds +++ b/target/linux/ath79/base-files/etc/board.d/01_leds @@ -93,6 +93,8 @@ tplink,tl-wr841-v11) ucidef_set_led_switch "lan3" "LAN3" "tp-link:green:lan3" "switch0" "0x04" ucidef_set_led_switch "lan4" "LAN4" "tp-link:green:lan4" "switch0" "0x02" ;; +ubnt,airrouter) + ;; ubnt,bullet-m|\ ubnt,nano-m|\ ubnt,rocket-m) diff --git a/target/linux/ath79/base-files/etc/board.d/02_network b/target/linux/ath79/base-files/etc/board.d/02_network index 5f02c5769a..8fb0188bb6 100755 --- a/target/linux/ath79/base-files/etc/board.d/02_network +++ b/target/linux/ath79/base-files/etc/board.d/02_network @@ -31,6 +31,11 @@ ath79_setup_interfaces() wd,mynet-wifi-rangeextender) ucidef_set_interface_lan "eth0" ;; + ubnt,airrouter) + ucidef_set_interfaces_lan_wan "eth1" "eth0" + ucidef_add_switch "switch0" \ + "0@eth1" "1:lan:4" "2:lan:3" "3:lan:2" "4:lan:1" + ;; avm,fritz4020) ucidef_set_interface_wan "eth0" ucidef_add_switch "switch0" \ diff --git a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom index 020abe2913..68f70174bb 100644 --- a/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom +++ b/target/linux/ath79/base-files/etc/hotplug.d/firmware/10-ath9k-eeprom @@ -141,6 +141,7 @@ case "$FIRMWARE" in tplink,tl-wr741-v1|\ tplink,tl-wr743nd-v1|\ tplink,tl-wr841-v7|\ + ubnt,airrouter|\ ubnt,bullet-m|\ ubnt,nano-m|\ ubnt,rocket-m) diff --git a/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts new file mode 100644 index 00..5b629a63f8 --- /dev/null +++ b/target/linux/ath79/dts/ar7241_ubnt_airrouter.dts @@ -0,0 +1,17 @@ +// SPDX-License-Identifier: GPL-2.0-or-later OR MIT +/dts-v1/; + +#include "ar7241_ubnt_xm.dtsi" + +/ { + compatible = "ubnt,airrouter", "qca,ar7241"; + model = "Ubiquiti AirRouter"; +}; + +_phy { +status = "okay"; +}; + + { +status = "okay"; +}; diff --git a/target/linux/ath79/image/generic-ubnt.mk b/target/linux/ath79/image/generic-ubnt.mk index bb86c8b288..a6d9b06332 100644 --- a/target/linux/ath79/image/generic-ubnt.mk +++ b/target/linux/ath79/image/generic-ubnt.mk @@ -63,6 +63,13 @@ define Device/ubnt-wa ATH_SOC := ar9342 endef +define Device/ubnt_airrouter + $(Device/ubnt-xm) + DEVICE_TITLE := Ubiquiti AirRouter + SUPPORTED_DEVICES += airrouter +endef +TARGET_DEVICES += ubnt_airrouter + define Device/ubnt_bullet-m $(Device/ubnt-xm) DEVICE_TITLE := Ubiquiti Bullet-M -- 2.19.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: add support for Skylab SKW92A in EVB
Specification: - MediaTek MT7628N/N (580 Mhz) - 64 MB of RAM - 16 MB of FLASH - 2T2R 2.4 GHz - 5x 10/100 Mbps Ethernet - 2x u.FL-connected antennas - Power by micro-USB connector at USB1 on EVB - UART via micro-USB connector at USB3 on EVB (57600 8n1) - 5x Ethernet LEDs - 1x WLAN LEDs - 1x WPS LED connected by jumper wire from I2S_CK on J20 to WPS_LED pin hole next to daughter board on EVB - WPS/Reset button (S2 on EVB) - RESET button (S1 on EVB) is *not* connected to RST hole next to daughter board Flash instruction: >From Skylab firmware: 1. Associate with SKYLAP_AP 2. In a browser, load: http://10.10.10.254/ 3. Username/password: admin/admin 4. In web admin interface: Administration / Upload Firmware, browse to sysupgrade image, apply, flash will fail with a message: Not a valid firmware. *** Warning: "/var/tmpFW" has corrupted data! 5. Telnet to 10.10.10.254, drops you into a root shell with no credentials 6. # cd /var 7. # mtd_write -r write tmpFW mtd4 Unlocking mtd4 ... Writing from tmpFW to mtd4 ... [e] 8. When flash has completed, you will have booted into your firmware. >From U-boot via TFTP and initramfs: 1. Place openwrt-ramips-mt76x8-skw92a-initramfs-kernel.bin on a TFTP server 2. Connect to serial console at USB3 on EVB 3. Connect ethernet between port 1 (not WAN) and your TFTP server (e.g. 192.168.11.20) 4. Start terminal software (e.g. screen /dev/ttyUSB0 57600) on PC 5. Apply power to EVB 6. Interrupt u-boot with keypress of "1" 7. At u-boot prompts: Input device IP (10.10.10.123) ==:192.168.11.21 Input server IP (10.10.10.3) ==:192.168.11.20 Input Linux Kernel filename (root_uImage) ==:openwrt-ramips-mt76x8-skw92a-initramfs-kernel.bin 8. Move ethernet to port 0 (WAN) on EVB 9. At new OpenWrt console shell, fetch squashfs-sysupgrade image and flash with sysupgrade. >From U-boot via TFTP direct flash: 1. Place openwrt-ramips-mt76x8-skw92a-squashfs-sysupgrade.bin on a TFTP server 2. Connect to serial console at USB3 on EVB (57600 8N1) 3. Connect ethernet between port 1 (not WAN) an your TFTP server (e.g. 192.168.11.20) 4. Start terminal software (e.g. screen /dev/ttyUSB0 57600) on PC 5. Apply power to EVB 6. Interrupt u-boot with keypress of "2" 7. At u-boot prompts: Warning!! Erase Linux in Flash then burn new one. Are you sure?(Y/N) Y Input device IP (10.10.10.123) ==:192.168.11.21 Input server IP (10.10.10.3) ==:192.168.11.20 Input Linux Kernel filename (root_uImage) ==:openwrt-ramips-mt76x8-skw92a-squashfs-sysupgrade.bin 8. When transfer is complete or as OpenWrt begins booting, move ethernet to port 0 (WAN). Signed-off-by: Russell Senior --- .../ramips/base-files/etc/board.d/01_leds | 3 + .../ramips/base-files/etc/board.d/02_network | 8 ++ target/linux/ramips/base-files/lib/ramips.sh | 3 + .../ramips/base-files/lib/upgrade/platform.sh | 1 + target/linux/ramips/dts/SKW92A.dts| 118 ++ target/linux/ramips/image/mt76x8.mk | 8 ++ 6 files changed, 141 insertions(+) create mode 100644 target/linux/ramips/dts/SKW92A.dts diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 2644bc0159..825a65b1d1 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -283,6 +283,9 @@ rt-n14u) ucidef_set_led_netdev "wan" "wan" "$boardname:blue:wan" eth0.2 set_wifi_led "$boardname:blue:air" ;; +skw92a) + set_wifi_led "$boardname:green:wlan" + ;; tama,w06) ucidef_set_led_netdev "wan" "WAN" "$boardname:green:wan" "eth0" ucidef_set_led_wlan "wlan" "WLAN" "$boardname:green:wlan" "phy0tpt" diff --git a/target/linux/ramips/base-files/etc/board.d/02_network b/target/linux/ramips/base-files/etc/board.d/02_network index 9e9ecbcb51..ac9f368419 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -345,6 +345,10 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "8@eth0" ;; + skw92a) + ucidef_add_switch "switch0" \ + "1:lan" "2:lan" "3:lan" "4:lan" "0:wan" "6@eth0" + ;; tew-638apb-v2) ucidef_add_switch "switch0" \ "4:lan" "6@eth0" @@ -554,6 +558,10 @@ ramips_setup_macs() lan_mac=$(macaddr_setbit_la "$lan_mac") wan_mac=$(mtd_get_mac_binary factory 32772)
Re: [OpenWrt-Devel] Regression in handling power cuts since 3a1e819b4e80 ("ovl: store file handle of lower inode on copy up")
On Sat, Oct 27, 2018 at 12:33 PM Richard Weinberger wrote: > Rafał, > > Am Montag, 22. Oktober 2018, 17:34:44 CEST schrieb Rafał Miłecki: > > Then I took a close look at ovl_copy_up_locked() and it seems above > > info isn't accurate. It seems to me that setxattr() happens between > > fsync and link. I modified my C app to follow that order (open, write, > > fsync, setxattr, link) and I can reproduce the problem now! > > > > Steps to reproduce the problem: > > 1) compile tmptest.c > > 2) tmptest /overlay/upper/foo.txt user.bar baz > > 3) wait 5 seconds (so ubifs writes to flash) > > 4) power cut > > 5) boot again and check content of /overlay/upper/foo.txt > > 6) in my case content appears to be 00 00 00 00 > > Just returned from Edinburgh and had a chance to look at the problem. > The problem is not that no write-back happens, in fact it happens just > fine. > But we have a problem upon journal replay if an unlinked file (O_TMPFILE) > gets relinked in combination with xattrs. > > Can you please give the attached patch a try? It is not perfect but if I > understand the problem correctly it should fix the issues you're facing. > Your patch seems to have fixed it for me, sample size = 1. -- Russell Senior russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] IPv6 and comcast fails
Works for me, on current HEAD*, with ar71xx (netgear wndr3800). Can you include your /etc/config/network and any other relevant configuration details? * $ git describe reboot-8373-gbc3d47cd12 -- Russell Senior, President russ...@personaltelco.net On Mon, Oct 22, 2018 at 11:01 AM Dave Taht wrote: > > We have confirmed fails for mips and x86 for even seeing any > ipv6 traffic on a comcast uplink, thus dhcpv6pd fails. > > See: > > https://bugs.openwrt.org/index.php?do=details_id=1763 > > > And > > > https://forum.openwrt.org/t/openwrt-18-06-rc1-doesnt-obtain-ipv6-address/16759/6 > > It was bisected back a few months in the latter bug report. > > However, I DO have ipv6 prefix delegation working on an arm a15 > box running the current stable release. > > Is there anything we can try to reconfigure (for ipv6 mcast?) to > even see these packets? Clue? > > > ___ > 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] patch: apply upstream cve fixes
Apply two upstream patches to address two CVEs: * CVE-2018-1000156 * CVE-2018-6952 Add PKG_CPE_ID to Makefile. Build tested on apm821xx and ar71xx. Signed-off-by: Russell Senior --- tools/patch/Makefile | 2 + .../patch/patches/010-CVE-2018-1000156.patch | 209 ++ tools/patch/patches/020-CVE-2018-6952.patch | 30 +++ 3 files changed, 240 insertions(+) create mode 100644 tools/patch/patches/010-CVE-2018-1000156.patch create mode 100644 tools/patch/patches/020-CVE-2018-6952.patch diff --git a/tools/patch/Makefile b/tools/patch/Makefile index 4c4c09bc08..26f1e3eee6 100644 --- a/tools/patch/Makefile +++ b/tools/patch/Makefile @@ -8,6 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=patch PKG_VERSION:=2.7.6 +PKG_RELEASE:=2 +PKG_CPE_ID:=cpe:/a:gnu:patch PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/patch diff --git a/tools/patch/patches/010-CVE-2018-1000156.patch b/tools/patch/patches/010-CVE-2018-1000156.patch new file mode 100644 index 00..c83e240fb6 --- /dev/null +++ b/tools/patch/patches/010-CVE-2018-1000156.patch @@ -0,0 +1,209 @@ +From ee2904728eb4364a36d62d66f723d0b68749e5df Mon Sep 17 00:00:00 2001 +From: Andreas Gruenbacher +Date: Fri, 6 Apr 2018 12:14:49 +0200 +Subject: [PATCH] Fix arbitrary command execution in ed-style patches + (CVE-2018-1000156) + +* src/pch.c (do_ed_script): Write ed script to a temporary file instead +of piping it to ed: this will cause ed to abort on invalid commands +instead of rejecting them and carrying on. +* tests/ed-style: New test case. +* tests/Makefile.am (TESTS): Add test case. +--- + src/pch.c | 89 +++ + tests/Makefile.am | 1 + + tests/ed-style| 41 ++ + 3 files changed, 108 insertions(+), 23 deletions(-) + create mode 100644 tests/ed-style + +diff --git a/src/pch.c b/src/pch.c +index ff9ed2c..8150493 100644 +--- a/src/pch.c b/src/pch.c +@@ -33,6 +33,7 @@ + # include + #endif + #include ++#include + + #define INITHUNKMAX 125 /* initial dynamic allocation size */ + +@@ -2388,22 +2389,28 @@ do_ed_script (char const *inname, char const *outname, + static char const editor_program[] = EDITOR_PROGRAM; + + file_offset beginning_of_this_line; +-FILE *pipefp = 0; + size_t chars_read; ++FILE *tmpfp = 0; ++char const *tmpname; ++int tmpfd; ++pid_t pid; ++ ++if (! dry_run && ! skip_rest_of_patch) ++ { ++ /* Write ed script to a temporary file. This causes ed to abort on ++ invalid commands such as when line numbers or ranges exceed the ++ number of available lines. When ed reads from a pipe, it rejects ++ invalid commands and treats the next line as a new command, which ++ can lead to arbitrary command execution. */ ++ ++ tmpfd = make_tempfile (, 'e', NULL, O_RDWR | O_BINARY, 0); ++ if (tmpfd == -1) ++pfatal ("Can't create temporary file %s", quotearg (tmpname)); ++ tmpfp = fdopen (tmpfd, "w+b"); ++ if (! tmpfp) ++pfatal ("Can't open stream for file %s", quotearg (tmpname)); ++ } + +-if (! dry_run && ! skip_rest_of_patch) { +- int exclusive = *outname_needs_removal ? 0 : O_EXCL; +- assert (! inerrno); +- *outname_needs_removal = true; +- copy_file (inname, outname, 0, exclusive, instat.st_mode, true); +- sprintf (buf, "%s %s%s", editor_program, +- verbosity == VERBOSE ? "" : "- ", +- outname); +- fflush (stdout); +- pipefp = popen(buf, binary_transput ? "wb" : "w"); +- if (!pipefp) +-pfatal ("Can't open pipe to %s", quotearg (buf)); +-} + for (;;) { + char ed_command_letter; + beginning_of_this_line = file_tell (pfp); +@@ -2414,14 +2421,14 @@ do_ed_script (char const *inname, char const *outname, + } + ed_command_letter = get_ed_command_letter (buf); + if (ed_command_letter) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (ed_command_letter != 'd' && ed_command_letter != 's') { + p_pass_comments_through = true; + while ((chars_read = get_line ()) != 0) { +- if (pipefp) +- if (! fwrite (buf, sizeof *buf, chars_read, pipefp)) ++ if (tmpfp) ++ if (! fwrite (buf, sizeof *buf, chars_read, tmpfp)) + write_fatal (); + if (chars_read == 2 && strEQ (buf, ".\n")) + break; +@@ -2434,13 +2441,49 @@ do_ed_script (char const *inname, char const *outname, +
Re: [OpenWrt-Devel] MR24 sysupgrade seems to be broken
Updating to a current ubi-utils seems to fix it. It looks like the version number didn't change with the fix though, so I needed to use --force-reinstall to overwrite ubi-info 2.0.2-1. On Mon, Jul 2, 2018 at 4:42 AM, Christian Lamparter wrote: > On Sunday, July 1, 2018 2:26:35 AM CEST Russell Senior wrote: > > Here is what shows during sysupgrade: > > > > https://pastebin.com/YfbQZ5fB > > > Have you tried the aforementioned fix for the buggy mtd-utils on > your old/existing installation or not? > > > On Sat, Jun 30, 2018 at 6:49 AM, Christian Lamparter > > > wrote: > > > On Saturday, June 30, 2018 10:06:21 AM CEST Russell Senior wrote: > > > > I just tried updating a Meraki MR24 to current master, from an image > a > > > few > > > > months old and it broke. I get a new kernel, but an old rootfs. I > have > > > > some of these deployed where a serial connection is awkward. It > would be > > > > nice if sysupgrade worked. > > > > > > > Any idea what broke it? From your description "new kernel, old rootfs" > it > > > could be the mtd-utils update to 2.0.2 that broke it: > > > > > > <https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h= > > > f37f63f38ccb706b196fe4934d0d9d92537eb832> > > > > > > and this was fixed by me just this month: > > > > > > <https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h= > > > daf19649dbf101ce7ae17abf84eeed7a30b41275> > > > (also upstream <http://git.infradead.org/mtd-utils.git/commit/ > > > 0f833ac73ad631248826386e2918d8571ecf0347>) > > > > > > so I think you would need to somehow update the mtd-utils > > > package (ubinfo, ubimkvol, ubirmvol, ...) on your old routers > > > before performing sysupgrading in order to fix this. > > > > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] MR24 sysupgrade seems to be broken
Here is what shows during sysupgrade: https://pastebin.com/YfbQZ5fB On Sat, Jun 30, 2018 at 6:49 AM, Christian Lamparter wrote: > On Saturday, June 30, 2018 10:06:21 AM CEST Russell Senior wrote: > > I just tried updating a Meraki MR24 to current master, from an image a > few > > months old and it broke. I get a new kernel, but an old rootfs. I have > > some of these deployed where a serial connection is awkward. It would be > > nice if sysupgrade worked. > > > Any idea what broke it? From your description "new kernel, old rootfs" it > could be the mtd-utils update to 2.0.2 that broke it: > > <https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h= > f37f63f38ccb706b196fe4934d0d9d92537eb832> > > and this was fixed by me just this month: > > <https://git.openwrt.org/?p=openwrt/openwrt.git;a=commitdiff;h= > daf19649dbf101ce7ae17abf84eeed7a30b41275> > (also upstream <http://git.infradead.org/mtd-utils.git/commit/ > 0f833ac73ad631248826386e2918d8571ecf0347>) > > so I think you would need to somehow update the mtd-utils > package (ubinfo, ubimkvol, ubirmvol, ...) on your old routers > before performing sysupgrading in order to fix this. > > Regards, > Christian > > > ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] MR24 sysupgrade seems to be broken
I just tried updating a Meraki MR24 to current master, from an image a few months old and it broke. I get a new kernel, but an old rootfs. I have some of these deployed where a serial connection is awkward. It would be nice if sysupgrade worked. -- Russell Senior russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] iproute2: update to 4.17.0
>>>>> Hans Dedecker writes: > Hi, On Sun, Jun 10, 2018 at 11:54 PM Russell Senior > wrote: >> >> >> Signed-off-by: Russell Senior --- > I get the following compile issues if the rdma utility is enabled : I wonder if rdma is actually useful in openwrt. As far as I can tell it's related to infiniband interfaces, which would seem to be rare in openwrt-supported devices. Comments? -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] iproute2: update to 4.17.0
Signed-off-by: Russell Senior --- package/network/utils/iproute2/Makefile | 6 +- ...int-fix-hidden-64-bit-type-promotion.patch | 288 -- .../utils/iproute2/patches/008-no_netem.patch | 4 +- .../iproute2/patches/110-extra-ccopts.patch | 2 +- .../iproute2/patches/120-libnetlink-pic.patch | 2 +- .../utils/iproute2/patches/300-ip_tiny.patch | 8 +- .../iproute2/patches/950-add-cake-to-tc.patch | 11 - 7 files changed, 11 insertions(+), 310 deletions(-) delete mode 100644 package/network/utils/iproute2/patches/002-json_print-fix-hidden-64-bit-type-promotion.patch diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 88a4851748..c5e9c5a66e 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=4.16.0 -PKG_RELEASE:=3 +PKG_VERSION:=4.17.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/linux/utils/net/iproute2 -PKG_HASH:=0c5c24020fd7349fe25728c5edee9fb6a1bc8a38f08e23be5c57a6301e55ee0a +PKG_HASH:=6fa991b092315887775b9e47dc6a89af7ae09dd3ad4ccff754d055c566b4be6e PKG_BUILD_PARALLEL:=1 PKG_BUILD_DEPENDS:=iptables PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/002-json_print-fix-hidden-64-bit-type-promotion.patch b/package/network/utils/iproute2/patches/002-json_print-fix-hidden-64-bit-type-promotion.patch deleted file mode 100644 index ad93973215..00 --- a/package/network/utils/iproute2/patches/002-json_print-fix-hidden-64-bit-type-promotion.patch +++ /dev/null @@ -1,288 +0,0 @@ -From 8de9593bb9dc05cb1be593a237682e8707e41aa9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Toke=20H=C3=B8iland-J=C3=B8rgensen?= -Date: Wed, 25 Apr 2018 16:19:35 +0200 -Subject: [PATCH] json_print: Fix hidden 64-bit type promotion -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -print_uint() will silently promote its variable type to uint64_t, but there -is nothing that ensures that the format string specifier passed along with -it fits (and the function name suggest to pass "%u"). - -Fix this by changing print_uint() to use a native 'unsigned int' type, and -introduce a separate print_u64() function for printing 64-bit values. All -call sites that were actually printing 64-bit values using print_uint() are -converted to use print_u64() instead. - -Since print_int() was already using native int types, just add a -print_s64() to match, but don't convert any call sites. - -Signed-off-by: Toke Høiland-Jørgensen -Signed-off-by: Kevin Darbyshire-Bryant - include/json_print.h | 4 +++- - include/json_writer.h | 12 ++ - ip/ipaddress.c| 62 +-- - ip/ipmacsec.c | 8 +++ - ip/ipmroute.c | 6 ++--- - lib/json_print.c | 4 +++- - lib/json_writer.c | 30 + - 7 files changed, 78 insertions(+), 48 deletions(-) - a/include/json_print.h -+++ b/include/json_print.h -@@ -56,10 +56,12 @@ void close_json_array(enum output_type t - print_color_##type_name(t, COLOR_NONE, key, fmt, value); \ - } - _PRINT_FUNC(int, int); -+_PRINT_FUNC(s64, int64_t); - _PRINT_FUNC(bool, bool); - _PRINT_FUNC(null, const char*); - _PRINT_FUNC(string, const char*); --_PRINT_FUNC(uint, uint64_t); -+_PRINT_FUNC(uint, unsigned int); -+_PRINT_FUNC(u64, uint64_t); - _PRINT_FUNC(hu, unsigned short); - _PRINT_FUNC(hex, unsigned int); - _PRINT_FUNC(0xhex, unsigned int); a/include/json_writer.h -+++ b/include/json_writer.h -@@ -34,9 +34,11 @@ void jsonw_string(json_writer_t *self, c - void jsonw_bool(json_writer_t *self, bool value); - void jsonw_float(json_writer_t *self, double number); - void jsonw_float_fmt(json_writer_t *self, const char *fmt, double num); --void jsonw_uint(json_writer_t *self, uint64_t number); -+void jsonw_uint(json_writer_t *self, unsigned int number); -+void jsonw_u64(json_writer_t *self, uint64_t number); - void jsonw_hu(json_writer_t *self, unsigned short number); --void jsonw_int(json_writer_t *self, int64_t number); -+void jsonw_int(json_writer_t *self, int number); -+void jsonw_s64(json_writer_t *self, int64_t number); - void jsonw_null(json_writer_t *self); - void jsonw_lluint(json_writer_t *self, unsigned long long int num); - -@@ -44,9 +46,11 @@ void jsonw_lluint(json_writer_t *self, u - void jsonw_string_field(json_writer_t *self, const char *prop, const char *val); - void jsonw_bool_field(json_writer_t *self, const char *prop, bool value); - void jsonw_float_field(json_writer_t *self, const char *prop, double num); --void jsonw_uint_field(json_writer_t *self, const char *prop, uint64_t num); -+void jsonw_uint_field(json_writer_t *self, const char *prop, unsigned int num); -+void jsonw_u64_field(json_writer_t *self, const char *prop, uint64_t nu
Re: [OpenWrt-Devel] node.js
>>>>> "Levente" == Levente <leventel...@gmail.com> writes: Levente> After selecting x86 platform, I can see the menu items. Is this Levente> intentional to include node only in x86 platform builds? Once upon a time, node.js was dependent on v8 (the javascript interpretter), and v8 was only available on particular architectures because of unported assembly components, or something vaguely like that. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.infradead.org/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [ath10k] [batman-adv] Robustness of batman-adv or IBSS/802.11s on ath9k (AR9331 chip)
>>>>> "Xuebing" == Xuebing Wang <xbi...@gmail.com> writes: Xuebing> Hi ath10k community, Does anyone use ath9k driver + 802.11s (or Xuebing> IBSS/adhoc) on commercial products? Xuebing> Our setup is AR9331 + ath9k driver + OpenWRT 15.05 + batman-adv Xuebing> 2016.1 (PKG_RELEASE:=3) Xuebing> We are very serious about robustness of running batman-adv on Xuebing> AR9331, because we have 20+ commercial sites running, each site Xuebing> is with about 20 nodes. - batman-adv + ar9331 work almost Xuebing> (well almost) perfectly. - Sometimes, one node drops off the Xuebing> mesh, occurrence rate is very low. - For one time, when Node Xuebing> drops off the mesh, "rmmod ath9k" then "modprobe ath9k" can get Xuebing> both batman-adv (and ibss/adhoc on top of ath9k) recover. This Xuebing> seemingly points to that the issue is with ath9k driver Xuebing> (ibss/adhoc mode). I'm running batman-adv on LEDE-project (r1497) on a TP-Link TP-WDR3600 with ibss/adhoc + ap on the 2.4GHz radio. This is ath9k, not ath10k. Seems to work fine, no problems. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [LEDE-DEV] [OpenWrt-Users] Talks between OpenWrt and LEDE
>>>>> "John" == John Crispin <j...@phrozen.org> writes: >> IMHO if you want to add "freshness" and still leverage the old brand >> you do something like, e.g., Pepsi Zero. You do "The OpenWRT LEDE >> Edition!". >> >> Just a thought. >> John> certainly an interesting idea worth considering. FWIW, when our CWN was considering a rebranding (we still are, on the back burner), the advice we got was to phase in name changes over time scales of a year or so, with co-branding during the transition, very gradually increasing emphasis on the new name and decreasing emphasis on the old name. All names have upsides and downsides. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [LEDE-DEV] Talks between OpenWrt and LEDE
>>>>> "Florian" == Florian Fainelli <f.faine...@gmail.com> writes: >> However, I also agree with Dave, Alberto and Stefan that a name >> change may be a really smart way to communicate the fresh start of >> the project, a reboot, especially if the new name rides on the >> popularity of "OpenWRT". It could be for example "OpenLD" (LD for >> Linux Device) or "LibreWRT". Of course this is all conditional on the >> merge of OpenWRT and LEDE. If the projects do not merge, the OpenWRT >> folks and SPI may have a claim against the use of OpenLD or LibreWRT >> or alike. Florian> The point was that OpenWrt is already registered and managed by Florian> SPI, so we may as well keep using it, and that is just what I Florian> meant to say here, nothing more. -- Florian Not that a choice on a name, with taste and discretion, isn't going to be needed, but I can't help but think of this: https://en.wikipedia.org/wiki/Law_of_triviality PS: OpenLEDE. ;-) -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Tried to update ticket 20982 on dev.openwrt.org
> "Bill" == Bill Moffittwrites: Bill> I have been busy with other things, but I finally got a shipment Bill> of brand-new PicoStations (XM, identical to Bullet) here and tried Bill> to flash both the trunk builds of OpenWRT and LEDE on them. Bill> I'm getting the same error I did some months back: Bill> sent DATA
[OpenWrt-Devel] [PATCH] brcm47xx: fix wgt634u port assignment, broken since openwrt r47866
Signed-off-by: Russell Senior <russ...@personaltelco.net> --- target/linux/brcm47xx/base-files/etc/board.d/01_detect | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/brcm47xx/base-files/etc/board.d/01_detect b/target/linux/brcm47xx/base-files/etc/board.d/01_detect index 91ac16e..16b81d4 100755 --- a/target/linux/brcm47xx/base-files/etc/board.d/01_detect +++ b/target/linux/brcm47xx/base-files/etc/board.d/01_detect @@ -124,7 +124,7 @@ detect_by_model() { # Netgear WGT634U exception if grep -sqE 'mtd0: 000(6|a)' /proc/mtd; then ucidef_add_switch "switch0" \ - "0:wan" "1:lan" "2:lan" "3:lan" "4:lan" "5@eth0" + "0:lan" "1:lan" "2:lan" "3:lan" "4:wan" "5@eth0" return fi -- 2.8.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] ramips: mtk_soc_eth vs old ralink ethernet driver for the M2M
>>>>> "Russell" == Russell Senior <russ...@personaltelco.net> writes: >>>>> "Russell" == Russell Senior <russ...@personaltelco.net> writes: >>>>> "John" == John Crispin <blo...@openwrt.org> writes: John> i'll try to test during the day. i had tested most socs but John> apparently 5350 still has an issue. Russell> Yes, I saw this too, and was about to report it. I'm seeing it Russell> on an AsiaRF AWM002, which is also an RT5350. Russell> swconfig list returns nothing, fwiw. Russell> Any progress on this? Afaik, rt5350 ethernet is still broken Russell> in trunk. Hmm. Just tried r48061 in my asiarf awm002: Starting kernel ... [0.00] Linux version 4.3.0 (openwrt@hawg) (gcc version 5.2.0 (OpenWrt GCC 5.2.0 r48005) ) #1 Sat Jan 2 00:55:26 PST 2016 [0.00] SoC Type: Ralink RT5350 id:1 rev:3 [0.00] bootconsole [early0] enabled [0.00] CPU0 revision is: 0001964c (MIPS 24KEc) [0.00] MIPS: machine is MTHDCS [0.00] Determined physical RAM map: [0.00] memory: 0200 @ (usable) [0.00] Initrd not found or empty - disabling initrd [0.00] Zone ranges: [0.00] Normal [mem 0x-0x01ff] [0.00] Movable zone start for each node [0.00] Early memory node ranges [0.00] node 0: [mem 0x-0x01ff] [0.00] Initmem setup node 0 [mem 0x-0x01ff] [0.00] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes. [0.00] Primary data cache 16kB, 4-way, VIPT, no aliases, linesize 32 bytes [0.00] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 8128 [0.00] Kernel command line: console=ttyS0,57600 rootfstype=squashfs,jffs2 [0.00] PID hash table entries: 128 (order: -3, 512 bytes) [0.00] Dentry cache hash table entries: 4096 (order: 2, 16384 bytes) [0.00] Inode-cache hash table entries: 2048 (order: 1, 8192 bytes) [0.00] Writing ErrCtl register=000401a0 [0.00] Readback ErrCtl register=000401a0 [0.00] Memory: 28620K/32768K available (2746K kernel code, 120K rwdata, 536K rodata, 172K init, 191K bss, 4148K reserved, 0K cma-reserved) [0.00] SLUB: HWalign=32, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 [0.00] NR_IRQS:256 [0.00] CPU Clock: 360MHz [0.00] clocksource: systick: mask: 0x max_cycles: 0x, max_idle_ns: 583261500 ns [0.00] systick: running - mult: 214748, shift: 32 [0.00] clocksource: MIPS: mask: 0x max_cycles: 0x, max_idle_ns: 10618113593 ns [0.15] sched_clock: 32 bits at 180MHz, resolution 5ns, wraps every 11930464253ns [0.015663] Calibrating delay loop... 239.61 BogoMIPS (lpj=1198080) [0.090892] pid_max: default: 32768 minimum: 301 [0.100339] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes) [0.113417] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes) [0.137998] clocksource: jiffies: mask: 0x max_cycles: 0x, max_idle_ns: 1911260446275 ns [0.157771] pinctrl core: initialized pinctrl subsystem [0.169509] NET: Registered protocol family 16 [0.221811] rt2880_gpio 1600.gpio: registering 22 gpios [0.232930] rt2880_gpio 1600.gpio: registering 22 irq handlers [0.248275] clocksource: Switched to clocksource MIPS [0.261177] NET: Registered protocol family 2 [0.271551] TCP established hash table entries: 1024 (order: 0, 4096 bytes) [0.285446] TCP bind hash table entries: 1024 (order: 0, 4096 bytes) [0.298035] TCP: Hash tables configured (established 1024 bind 1024) [0.310897] UDP hash table entries: 256 (order: 0, 4096 bytes) [0.322524] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes) [0.335480] NET: Registered protocol family 1 [0.345177] rt-timer 1100.timer: maximum frequency is 3662Hz [0.359265] futex hash table entries: 256 (order: -1, 3072 bytes) [0.416109] squashfs: version 4.0 (2009/01/31) Phillip Lougher [0.427735] jffs2: version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc. [0.454251] io scheduler noop registered [0.462056] io scheduler deadline registered (default) [0.473886] gpio-export gpio_export: 1 gpio(s) exported [0.484785] Serial: 8250/16550 driver, 2 ports, IRQ sharing disabled [0.51] console [ttyS0] disabled [0.507044] 1c00.uartlite: ttyS0 at MMIO 0x1c00 (irq = 20, base_baud = 250) is a Palmchip BK-3103 [0.526873] console [ttyS0] enabled [0.526873] console [ttyS0] enabled [0.540648] bootconsole [early0] disabled [0.540648] bootconsole [early0] disabled [0.567495] spi spi0.0: force spi mode3 [0.575940] m25p80 spi0.0: mx25l6405d (8192 Kbytes) [0.585848] 4 ofpart partiti
Re: [OpenWrt-Devel] ramips: mtk_soc_eth vs old ralink ethernet driver for the M2M
On Sat, Jan 2, 2016 at 2:45 AM, John Crispinwrote: > Hi Russel, > > i'll have a look now. [...] Ethernet appears to be working (no more panics) in r48064, thanks! ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] ramips: mtk_soc_eth vs old ralink ethernet driver for the M2M
>>>>> "Russell" == Russell Senior <russ...@personaltelco.net> writes: >>>>> "John" == John Crispin <blo...@openwrt.org> writes: John> i'll try to test during the day. i had tested most socs but John> apparently 5350 still has an issue. Russell> Yes, I saw this too, and was about to report it. I'm seeing it Russell> on an AsiaRF AWM002, which is also an RT5350. Russell> swconfig list returns nothing, fwiw. Any progress on this? Afaik, rt5350 ethernet is still broken in trunk. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] ramips: mtk_soc_eth vs old ralink ethernet driver for the M2M
>>>>> "John" == John Crispin <blo...@openwrt.org> writes: John> i'll try to test during the day. i had tested most socs but John> apparently 5350 still has an issue. Yes, I saw this too, and was about to report it. I'm seeing it on an AsiaRF AWM002, which is also an RT5350. swconfig list returns nothing, fwiw. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH v4] ramips: add support for MQmaker WiTi board
>>>>> "Dave" == Dave Taht <dave.t...@gmail.com> writes: Dave> Is this the one with the promising 802.11ac chipset? If so, how Dave> do I get a few? Dave> If not, how do I get one? :) Duck duck go and a few mouse clicks found me this link: http://www.aliexpress.com/item/WiTi-Board-Extensible-Powerful-Wifi-Router/32523122606.html?spm=2114.01020208.3.8.crUD8y_ab_test=searchweb201556_2_79_78_77_80,searchweb201644_5,searchweb201560_9 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] oxnas: add missing platform bindings for stmmac glue
>>>>> "Daniel" == Daniel Golle <dan...@makrotopia.org> writes: Daniel> r47218 was missing needed changes which were accidentally Daniel> ommitted from the patch. Daniel> This should fix #20878 Tested, with this patch, eth0 works again. Though I am getting random MAC addresses on eth0. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] x86: add a subtarget for PCEngines APU
>>>>> "Felix" == Felix Fietkau <n...@openwrt.org> writes: Felix> On 2015-11-08 07:24, Russell Senior wrote: >> >> Reworked from patch by Ben Pfountz <netpri...@vt.edu> Builds and >> boots. >> >> Signed-off-by: Russell Senior <russ...@personaltelco.net> Felix> Why do we need a subtarget for APU instead of just running the Felix> generic one on it? It conveniently selects/deselects a bunch of .config options (e.g. sets an appropriate BAUDRATE, selects USB options). I haven't studied all the differences closely. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] x86: add a subtarget for PCEngines APU
Reworked from patch by Ben Pfountz <netpri...@vt.edu> Builds and boots. Signed-off-by: Russell Senior <russ...@personaltelco.net> --- target/linux/generic/files/drivers/leds/leds-apu.c | 234 + .../linux/generic/patches-3.18/835-led_apu.patch | 28 +++ target/linux/x86/Makefile | 2 +- target/linux/x86/apu/config-default| 223 target/linux/x86/apu/target.mk | 16 ++ 5 files changed, 502 insertions(+), 1 deletion(-) create mode 100644 target/linux/generic/files/drivers/leds/leds-apu.c create mode 100644 target/linux/generic/patches-3.18/835-led_apu.patch create mode 100644 target/linux/x86/apu/config-default create mode 100644 target/linux/x86/apu/target.mk diff --git a/target/linux/generic/files/drivers/leds/leds-apu.c b/target/linux/generic/files/drivers/leds/leds-apu.c new file mode 100644 index 000..246a1b3 --- /dev/null +++ b/target/linux/generic/files/drivers/leds/leds-apu.c @@ -0,0 +1,234 @@ +/* + * LEDs driver for PCEngines apu + * + * Copyright (C) 2013 Christian Herzog <dad...@daduke.org>, based on + * Petr Leibman's leds-alix + * Based on leds-wrap.c + * Hardware info taken from http://www.dpie.com/manuals/miniboards/kontron/KTD-S0043-0_KTA55_SoftwareGuide.pdf + * + * 2014-12-8: Mark Schank + * - Added GPIO support for the APU push-button switch. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#define APU_BUTTON // Enable gpio support for the APU button switch + +#include +#include +#include +#include +#include +#ifdef APU_BUTTON +#include +#endif +#include +#include + +#define DRVNAME"apu-led" +#define BASEADDR (0xFED801BD) +#define LEDON (0x8) +#define LEDOFF (0xC8) + +static struct platform_device *pdev; +unsigned int *p1; +unsigned int *p2; +unsigned int *p3; + +#ifdef APU_BUTTON +#define BUTTONADDR (0xFED801BB) +unsigned int *b1; +#endif + +static void apu_led_set_1(struct led_classdev *led_cdev, + enum led_brightness value) { + if (value) + iowrite8(LEDON, p1); + else + iowrite8(LEDOFF, p1); +} + +static void apu_led_set_2(struct led_classdev *led_cdev, + enum led_brightness value) { + if (value) + iowrite8(LEDON, p2); + else + iowrite8(LEDOFF, p2); +} + +static void apu_led_set_3(struct led_classdev *led_cdev, + enum led_brightness value) { + if (value) + iowrite8(LEDON, p3); + else + iowrite8(LEDOFF, p3); +} + +static struct led_classdev apu_led_1 = { + .name = "apu:1", + .brightness_set = apu_led_set_1, +}; + +static struct led_classdev apu_led_2 = { + .name = "apu:2", + .brightness_set = apu_led_set_2, +}; + +static struct led_classdev apu_led_3 = { + .name = "apu:3", + .brightness_set = apu_led_set_3, +}; + +#ifdef APU_BUTTON +static int gpio_apu_button_direction_in(struct gpio_chip *gc, unsigned gpio_num) +{ + u8 curr_state; + + curr_state = ioread8(b1); + iowrite8(curr_state | (1 << 5), b1); + + return 0; +} + +static int gpio_apu_button_get(struct gpio_chip *gc, unsigned gpio_num) +{ + u8 curr_state; + + curr_state = ioread8(b1); + + return((curr_state & (1 << 7)) == (1 << 7)); +} + +static struct gpio_chip apu_gpio_button = { + .label = "apu_button", + .owner = THIS_MODULE, + .get= gpio_apu_button_get, + .direction_input= gpio_apu_button_direction_in, + .base = 187, + .ngpio = 1, +}; +#endif + + +#ifdef CONFIG_PM +static int apu_led_suspend(struct platform_device *dev, + pm_message_t state) +{ + led_classdev_suspend(_led_1); + led_classdev_suspend(_led_2); + led_classdev_suspend(_led_3); + return 0; +} + +static int apu_led_resume(struct platform_device *dev) +{ + led_classdev_resume(_led_1); + led_classdev_resume(_led_2); + led_classdev_resume(_led_3); + return 0; +} +#else +#define apu_led_suspend NULL +#define apu_led_resume NULL +#endif + +static int apu_led_probe(struct platform_device *pdev) +{ + int ret; + + ret = led_classdev_register(>dev, _led_1); + if (ret == 0) + { + ret = led_classdev_register(>dev, _led_2); + if (ret >= 0) + { + ret = led_classdev_register(>dev, _led_3); + if (ret >= 0) + { +#ifdef APU_BUTTON +
Re: [OpenWrt-Devel] [PATCH 1/1] Fix bridge-utils file offset
Ted == Ted Hess th...@kitschensync.net writes: Ted Nikolay - bridge-utils has not been moved to Github since it has no Ted owner/maintainer who has volunteered to do that. It is still in the Ted oldpackages repo which is no longer supported. If you want to do Ted the work to contribute to the Github repo, please read our Ted guidelines Ted (https://github.com/openwrt/packages/blob/master/CONTRIBUTING.md) Ted and submit a pull-request. Otherwise, post an issue there and see Ted if someone does it for you. One other suggestion, for whoever picks it up: change the upstream link to the canonical (afaict) git tree, here: git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/bridge-utils.git -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH 1/1] Fix bridge-utils file offset handling
Nikolay == Nikolay Martynov mar.ko...@gmail.com writes: Nikolay Hi. Thanks for you response! Nikolay Please forgive my noobiness but I wasn't able to find Nikolay brigde-utils in https://github.com/openwrt/packages. Is it Nikolay supposed to be somo other feed? I would really appreciate if Nikolay you could clarify. John was wrong, afaict (as of the last time I sync'd up, which was a few days ago). In my tree, bridge-utils is in old-packages (unmaintained stuff). You can give it some CPR by moving it to the github packages feed and becoming the maintainer! -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [BUG] ramips: LED timer trigger busted since transition from kernel 3.10.x
See ticket #19646 https://dev.openwrt.org/ticket/19646 Something clearly haywire with the timer trigger, resulting in an irregular blink. r42304 == good; r42305 == bad. Observed on an AsiaRF AWM002. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] iproute2: update to v4.0.0
The most significant change from the previous version is the trimming of the 300-ip_tiny.patch to lib/utils.c where a section previously patched had vanished. That section of the patch was removed. Built and lightly tested on ar71xx against uClibc and musl. Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile| 4 ++-- .../utils/iproute2/patches/006-no_sctp.patch | 2 +- .../iproute2/patches/120-libnetlink-pic.patch | 4 ++-- .../utils/iproute2/patches/300-ip_tiny.patch | 22 +++--- .../iproute2/patches/900-drop_FAILED_POLICY.patch | 2 +- 5 files changed, 9 insertions(+), 25 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index a2dae6d..308ec57 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.19.0 +PKG_VERSION:=4.0.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=237083a1e3c388cde7a115a5724dc72a +PKG_MD5SUM:=3adc263ade4ee76c35032e8f50b54108 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch b/package/network/utils/iproute2/patches/006-no_sctp.patch index a3b2880..4aa9884 100644 --- a/package/network/utils/iproute2/patches/006-no_sctp.patch +++ b/package/network/utils/iproute2/patches/006-no_sctp.patch @@ -8,7 +8,7 @@ case IPPROTO_DCCP: default: /* XXX */ if (sel-sport_mask) -@@ -1336,7 +1335,6 @@ static int xfrm_selector_upspec_parse(st +@@ -1337,7 +1336,6 @@ static int xfrm_selector_upspec_parse(st switch (sel-proto) { case IPPROTO_TCP: case IPPROTO_UDP: diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch index 26cc569..19ccd1a 100644 --- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch +++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch @@ -7,5 +7,5 @@ -CFLAGS += -fPIC +CFLAGS += $(FPIC) - UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o - + UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \ + names.o diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 4295d0a..14518dc 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -70,7 +70,7 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -630,6 +630,7 @@ const char *rt_addr_n2a(int af, const vo +@@ -642,6 +642,7 @@ const char *rt_addr_n2a(int af, const vo case AF_INET: case AF_INET6: return inet_ntop(af, addr, buf, buflen); @@ -78,7 +78,7 @@ case AF_IPX: return ipx_ntop(af, addr, buf, buflen); case AF_DECnet: -@@ -638,6 +639,7 @@ const char *rt_addr_n2a(int af, const vo +@@ -650,6 +651,7 @@ const char *rt_addr_n2a(int af, const vo memcpy(dna.a_addr, addr, 2); return dnet_ntop(af, dna, buf, buflen); } @@ -86,22 +86,6 @@ default: return ???; } -@@ -713,6 +715,7 @@ const char *format_host(int af, int len, - case AF_INET6: - len = 16; - break; -+#ifndef IPROUTE2_TINY - case AF_IPX: - len = 10; - break; -@@ -723,6 +726,7 @@ const char *format_host(int af, int len, - len = 2; - break; - #endif -+#endif - default: ; - } - } --- a/lib/Makefile +++ b/lib/Makefile @@ -4,6 +4,10 @@ ifeq ($(IP_CONFIG_SETNS),y) @@ -114,4 +98,4 @@ + CFLAGS += $(FPIC) - UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o + UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o \ diff --git a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch index 7b82933..f5d2dfe 100644 --- a/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch +++ b/package/network/utils/iproute2/patches/900-drop_FAILED_POLICY.patch @@ -24,7 +24,7 @@ Subject: [PATCH] add support for dropping with FAILED_POLICY --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h -@@ -203,6 +203,7 @@ enum { +@@ -208,6 +208,7 @@ enum { RTN_THROW, /* Not in this table*/ RTN_NAT
[OpenWrt-Devel] [BUG] UCI parsing regression?
I just mentioned this on IRC last night, and have not had time to investigate, but a uci-defaults script (http://sprunge.us/EAYF) that was working about a month ago, now gives me this: http://sprunge.us/LTWi, and the uci commit fails. The error messages don't give much clue what's wrong. Seems like a regression. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] directory completeness problems
John == John Crispin blo...@openwrt.org writes: John On 10/12/2014 01:37, Russell Senior wrote: I am also wondering whether or not OpenWrt should be using ubifs (like for the generic NAND subtarget) for the Mikrotik subtarget. Thoughts? John yes, i have a mikrotik board on my desk already for this purpose. Ping. Current trunk is kernel panic'ing on this (mikrotik rb493g) hardware: http://pastebin.com/xX8vVGkY Getting off yaffs might help? I'm suffering a different ipv6 kernel panic (a few times a day) on the r43530 image I'm using now, which has been fixed, but the pastebin panic and the yaffs bug is impeding my updates. Any progress? -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] x86: update to kernel 3.18
John == John Crispin blo...@openwrt.org writes: John Hi Russel, can you also send a boot log of the failing soekris so John we can see if we have an idea on how to fix it ? The failure is on Soekris net48xx (I am testing net4826, specifically). Typically, the boot either hangs or resets immediately after Grub attempts to boot the kernel, after: Booting `OpenWrt' If I: a) use the serial console to 'edit' the boot option, then launch with Ctrl-x; or b) edit (e.g. by mounting /dev/sda1 at /mnt and then vi /mnt/boot/grub/grub.cfg) grub.cfg to remove the first two lines: serial --unit=0 --speed=19200 --word=8 --parity=no --stop=1 terminal_input serial; terminal_output serial then it boots and runs mostly normally. There may be a clock problem, as the boot seems slow. The bootlog after employing option (b) above, looks like this: https://personaltelco.net/~russell/net4826-after-grub.cfg-edit-boot.log -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] x86: update to kernel 3.18
John On 02/03/2015 08:20, Russell Senior wrote: copied target/linux/x86/config-3.14 and target/linux/x86/patches-3.14 to 3.18 equivalents and then tweaked until it built. Tested on alix2, soekris net4826 and soekris net4521. Still having trouble with net4826 booting from Grub, alix2 and net4521 are fine. John Hi, John did you manage to fix the net4816 boot issue ? No, not yet. Also, I've encountered some problems with OLSR when using ipv6 that were not present on 3.14 with the same configuration. The OLSR problem is not specific to x86, I am seeing it on ar71xx as well. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] x86: update to kernel 3.18
John == John Crispin blo...@openwrt.org writes: Russell copied target/linux/x86/config-3.14 and Russell target/linux/x86/patches-3.14 to 3.18 equivalents and then Russell tweaked until it built. Russell Tested on alix2, soekris net4826 and soekris net4521. Russell Still having trouble with net4826 booting from Grub, alix2 and Russell net4521 are fine. John Hi, John did you manage to fix the net4816 boot issue ? Russell No, not yet. Russell Also, I've encountered some problems with OLSR when using ipv6 Russell that were not present on 3.14 with the same configuration. The Russell OLSR problem is not specific to x86, I am seeing it on ar71xx Russell as well. John What kind of problems are you seeing ? Lots of messages (one to three per second) like this: Wed Mar 11 12:18:36 2015 daemon.info olsrd[1383]: detected duplicate packet with seqnr 0xf78c from 2001:::: I've inquired with the OLSR people, but this usually comes from bridging problems which don't seem to be present in my situation, so it is unresolved. Tcpdump doesn't show any duplicate seqnr's afaict. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] x86: update to kernel 3.18
copied target/linux/x86/config-3.14 and target/linux/x86/patches-3.14 to 3.18 equivalents and then tweaked until it built. Tested on alix2, soekris net4826 and soekris net4521. Still having trouble with net4826 booting from Grub, alix2 and net4521 are fine. Signed-off-by: Russell Senior russ...@personaltelco.net diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile index 52d9885..396d483 100644 --- a/target/linux/x86/Makefile +++ b/target/linux/x86/Makefile @@ -13,7 +13,7 @@ FEATURES:=squashfs ext4 vdi vmdk pcmcia targz SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos alix2 thincan \ rdc -KERNEL_PATCHVER:=3.14 +KERNEL_PATCHVER:=3.18 KERNELNAME:=bzImage diff --git a/target/linux/x86/config-3.18 b/target/linux/x86/config-3.18 new file mode 100644 index 000..95786f9 --- /dev/null +++ b/target/linux/x86/config-3.18 @@ -0,0 +1,430 @@ +# CONFIG_60XX_WDT is not set +# CONFIG_64BIT is not set +# CONFIG_ACPI is not set +# CONFIG_ACQUIRE_WDT is not set +# CONFIG_ADVANTECH_WDT is not set +# CONFIG_ALIM1535_WDT is not set +# CONFIG_ALIX is not set +CONFIG_AMD_NB=y +CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y +CONFIG_ARCH_DEFCONFIG=arch/x86/configs/i386_defconfig +CONFIG_ARCH_DISCARD_MEMBLOCK=y +CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y +CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y +CONFIG_ARCH_HAS_CPU_AUTOPROBE=y +CONFIG_ARCH_HAS_CPU_RELAX=y +CONFIG_ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS=y +CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_HWEIGHT_CFLAGS=-fcall-saved-ecx -fcall-saved-edx +CONFIG_ARCH_MAY_HAVE_PC_FDC=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MIGHT_HAVE_PC_SERIO=y +# CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED is not set +# CONFIG_ARCH_RANDOM is not set +CONFIG_ARCH_SELECT_MEMORY_MODEL=y +CONFIG_ARCH_SPARSEMEM_ENABLE=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y +CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y +CONFIG_ARCH_SUPPORTS_NUMA_BALANCING=y +CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USES_PG_UNCACHED=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_WANTS_PROT_NUMA_PROT_NONE=y +CONFIG_ARCH_WANT_FRAME_POINTERS=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_HUGE_PMD_SHARE=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y +CONFIG_ATA=y +CONFIG_ATA_GENERIC=y +CONFIG_ATA_PIIX=y +# CONFIG_AUDIT_ARCH is not set +CONFIG_BINFMT_MISC=y +CONFIG_BLK_DEV_SD=y +CONFIG_BOUNCE=y +CONFIG_CLKBLD_I8253=y +CONFIG_CLKEVT_I8253=y +CONFIG_CLKSRC_I8253=y +CONFIG_CLOCKSOURCE_WATCHDOG=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_COMPAT_VDSO=y +CONFIG_CONSOLE_TRANSLATIONS=y +# CONFIG_CPU5_WDT is not set +CONFIG_CPU_FREQ=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_GOV_USERSPACE is not set +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_STAT_DETAILS=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_SUP_AMD=y +CONFIG_CPU_SUP_CENTAUR=y +CONFIG_CPU_SUP_CYRIX_32=y +CONFIG_CPU_SUP_INTEL=y +CONFIG_CPU_SUP_TRANSMETA_32=y +CONFIG_CPU_SUP_UMC_32=y +CONFIG_CRC16=y +CONFIG_CRYPTO_CRC32C=y +# CONFIG_CRYPTO_CRC32_PCLMUL is not set +# CONFIG_CRYPTO_DEV_QAT_DH895xCC is not set +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +# CONFIG_CRYPTO_SERPENT_SSE2_586 is not set +# CONFIG_CX_ECAT is not set +CONFIG_DCACHE_WORD_ACCESS=y +# CONFIG_DCDBAS is not set +# CONFIG_DEBUG_BOOT_PARAMS is not set +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_NMI_SELFTEST is not set +# CONFIG_DEBUG_TLBFLUSH is not set +# CONFIG_DEBUG_VIRTUAL is not set +CONFIG_DECOMPRESS_BZIP2=y +CONFIG_DECOMPRESS_GZIP=y +CONFIG_DEFAULT_IO_DELAY_TYPE=0 +# CONFIG_DELL_RBU is not set +# CONFIG_DMI is not set +CONFIG_DNOTIFY=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_EARLY_PRINTK=y +# CONFIG_EARLY_PRINTK_DBGP is not set +# CONFIG_EDD is not set +# CONFIG_EUROTECH_WDT is not set +CONFIG_EXT4_FS=y +# CONFIG_F71808E_WDT is not set +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_FIRMWARE_MEMMAP=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_FS_MBCACHE=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y +CONFIG_GENERIC_CLOCKEVENTS_BUILD=y +CONFIG_GENERIC_CLOCKEVENTS_MIN_ADJUST=y +CONFIG_GENERIC_CMOS_UPDATE=y +CONFIG_GENERIC_FIND_FIRST_BIT=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IOMAP=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_ISA_DMA=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +# CONFIG_GOOGLE_FIRMWARE is not set +# CONFIG_HANGCHECK_TIMER is not set +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y
[OpenWrt-Devel] [PATCH] iproute2: bump version from v3.18.0 to v3.19.0
with refreshed patches Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 4 ++-- .../network/utils/iproute2/patches/006-no_sctp.patch| 4 ++-- .../utils/iproute2/patches/120-libnetlink-pic.patch | 7 --- .../utils/iproute2/patches/200-add-tc_esfq.patch| 2 +- .../utils/iproute2/patches/210-add-act_connmark.patch | 4 ++-- .../network/utils/iproute2/patches/300-ip_tiny.patch| 17 + 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index ad14ac4..56d2897 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.18.0 +PKG_VERSION:=3.19.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=6f6ad51a7880460e103367b16057 +PKG_MD5SUM:=237083a1e3c388cde7a115a5724dc72a PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch b/package/network/utils/iproute2/patches/006-no_sctp.patch index d4a0de0..a3b2880 100644 --- a/package/network/utils/iproute2/patches/006-no_sctp.patch +++ b/package/network/utils/iproute2/patches/006-no_sctp.patch @@ -1,6 +1,6 @@ --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c -@@ -469,7 +469,6 @@ void xfrm_selector_print(struct xfrm_sel +@@ -467,7 +467,6 @@ void xfrm_selector_print(struct xfrm_sel switch (sel-proto) { case IPPROTO_TCP: case IPPROTO_UDP: @@ -8,7 +8,7 @@ case IPPROTO_DCCP: default: /* XXX */ if (sel-sport_mask) -@@ -1282,7 +1281,6 @@ static int xfrm_selector_upspec_parse(st +@@ -1336,7 +1335,6 @@ static int xfrm_selector_upspec_parse(st switch (sel-proto) { case IPPROTO_TCP: case IPPROTO_UDP: diff --git a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch index 3ea7d19..26cc569 100644 --- a/package/network/utils/iproute2/patches/120-libnetlink-pic.patch +++ b/package/network/utils/iproute2/patches/120-libnetlink-pic.patch @@ -1,10 +1,11 @@ --- a/lib/Makefile +++ b/lib/Makefile -@@ -1,6 +1,6 @@ - include ../Config +@@ -4,7 +4,7 @@ ifeq ($(IP_CONFIG_SETNS),y) + CFLAGS += -DHAVE_SETNS + endif -CFLAGS += -fPIC +CFLAGS += $(FPIC) - UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o + UTILOBJ=utils.o rt_names.o ll_types.o ll_proto.o ll_addr.o inet_proto.o namespace.o diff --git a/package/network/utils/iproute2/patches/200-add-tc_esfq.patch b/package/network/utils/iproute2/patches/200-add-tc_esfq.patch index 19d8199..6c148ea 100644 --- a/package/network/utils/iproute2/patches/200-add-tc_esfq.patch +++ b/package/network/utils/iproute2/patches/200-add-tc_esfq.patch @@ -1,6 +1,6 @@ --- a/tc/Makefile +++ b/tc/Makefile -@@ -8,6 +8,7 @@ SHARED_LIBS ?= y +@@ -13,6 +13,7 @@ SHARED_LIBS ?= y TCMODULES := TCMODULES += q_fifo.o TCMODULES += q_sfq.o diff --git a/package/network/utils/iproute2/patches/210-add-act_connmark.patch b/package/network/utils/iproute2/patches/210-add-act_connmark.patch index c0bf07a..10167ae 100644 --- a/package/network/utils/iproute2/patches/210-add-act_connmark.patch +++ b/package/network/utils/iproute2/patches/210-add-act_connmark.patch @@ -1,13 +1,13 @@ --- a/tc/Makefile +++ b/tc/Makefile -@@ -39,6 +39,7 @@ TCMODULES += m_mirred.o +@@ -44,6 +44,7 @@ TCMODULES += m_mirred.o TCMODULES += m_nat.o TCMODULES += m_pedit.o TCMODULES += m_skbedit.o +TCMODULES += m_connmark.o TCMODULES += m_csum.o TCMODULES += m_simple.o - TCMODULES += p_ip.o + TCMODULES += m_vlan.o --- /dev/null +++ b/tc/m_connmark.c @@ -0,0 +1,74 @@ diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 3620120..4295d0a 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -25,7 +25,7 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, \1)) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -69,30 +69,42 @@ static const struct cmd { +@@ -71,30 +71,42 @@ static const struct cmd { int (*func)(int argc, char **argv); } cmds[] = { { address,do_ipaddr }, @@ -70,7 +70,7 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -629,6 +629,7 @@ const char *rt_addr_n2a(int af, const vo +@@ -630,6 +630,7 @@ const char *rt_addr_n2a(int af, const vo case AF_INET: case AF_INET6: return inet_ntop(af, addr, buf, buflen); @@ -78,7 +78,7 @@ case AF_IPX: return ipx_ntop(af, addr, buf
[OpenWrt-Devel] AsiaRF AWM002 (ramips) broken at r44349
(with r44364 cherry-picked so that openssl builds) still broken at r44439. [0.00] Linux version 3.14.32 (openwrt@iris) (gcc version 4.8.3 (OpenWrt/Linaro GCC 4.8-2014.04 r44364) ) #1 Fri Feb 13 21:49:18 PST 2015 [0.00] SoC Type: Ralink RT5350 id:1 rev:3 [0.00] bootconsole [early0] enabled [0.00] CPU0 revision is: 0001964c (MIPS 24KEc) [0.00] MIPS: machine is AsiaRF AWM002 EVB [0.00] Determined physical RAM map: [0.00] memory: 0200 @ (usable) [0.00] Initrd not found or empty - disabling initrd [0.00] Zone ranges: [0.00] Normal [mem 0x-0x01ff] [0.00] Movable zone start for each node [0.00] Early memory node ranges [0.00] node 0: [mem 0x-0x01ff] [0.00] Primary instruction cache 32kB, VIPT, 4-way, linesize 32 bytes. [0.00] Primary data cache 16kB, 4-way, VIPT, no aliases, linesize 32 bytes [0.00] Built 1 zonelists in Zone order, mobility grouping on. Total pages: 8128 [0.00] Kernel command line: console=ttyS0,57600 rootfstype=squashfs,jffs2 [0.00] PID hash table entries: 128 (order: -3, 512 bytes) [0.00] Dentry cache hash table entries: 4096 (order: 2, 16384 bytes) [0.00] Inode-cache hash table entries: 2048 (order: 1, 8192 bytes) [0.00] Writing ErrCtl register=000280f0 [0.00] Readback ErrCtl register=000280f0 [0.00] Memory: 29216K/32768K available (2293K kernel code, 115K rwdata, 456K rodata, 132K init, 180K bss, 3552K reserved) [0.00] SLUB: HWalign=32, Order=0-3, MinObjects=0, CPUs=1, Nodes=1 [0.00] NR_IRQS:256 [0.00] CPU Clock: 360MHz [0.00] systick: running - mult: 214748, shift: 32 [0.00] genirq: Flags mismatch irq 7. 00014600 (timer) vs. 00014600 (systick) [0.01] Calibrating delay loop... 479.23 BogoMIPS (lpj=2396160) [0.07] pid_max: default: 32768 minimum: 301 [0.07] Mount-cache hash table entries: 1024 (order: 0, 4096 bytes) [0.08] Mountpoint-cache hash table entries: 1024 (order: 0, 4096 bytes) [0.09] pinctrl core: initialized pinctrl subsystem [0.09] NET: Registered protocol family 16 [0.12] bio: create slab bio-0 at 0 [0.12] rt2880_gpio 1600.gpio: registering 22 gpios [0.13] rt2880_gpio 1600.gpio: registering 22 irq handlers [0.14] Switched to clocksource systick [0.14] NET: Registered protocol family 2 [0.16] TCP established hash table entries: 1024 (order: 0, 4096 bytes) [0.18] TCP bind hash table entries: 1024 (order: 0, 4096 bytes) [0.18] TCP: Hash tables configured (established 1024 bind 1024) [0.20] TCP: reno registered [0.21] UDP hash table entries: 256 (order: 0, 4096 bytes) [0.21] UDP-Lite hash table entries: 256 (order: 0, 4096 bytes) [0.23] NET: Registered protocol family 1 [0.24] rt-timer 1100.timer: maximum frequency is 7324Hz [0.26] futex hash table entries: 256 (order: -1, 3072 bytes) [0.30] squashfs: version 4.0 (2009/01/31) Phillip Lougher [0.33] jffs2: version 2.2 (NAND) (SUMMARY) (LZMA) (RTIME) (CMODE_PRIORITY) (c) 2001-2006 Red Hat, Inc. [0.35] msgmni has been set to 57 [0.35] io scheduler noop registered [0.37] io scheduler deadline registered (default) [0.37] Serial: 8250/16550 driver, 2 ports, IRQ sharing disabled [0.39] 1c00.uartlite: ttyS0 at MMIO 0x1c00 (irq = 20, base_baud = 250) is a 16550A [0.42] console [ttyS0] enabled [0.42] console [ttyS0] enabled [0.42] bootconsole [early0] disabled [0.42] bootconsole [early0] disabled [0.45] ralink_soc_eth 1010.ethernet eth0: ralink at 0xb010, irq 5 [0.48] rt3xxx-usbphy usbphy.3: loaded [0.48] rt2880_wdt 1120.watchdog: Initialized [0.50] TCP: cubic registered [0.51] NET: Registered protocol family 17 [0.51] 8021q: 802.1Q VLAN Support v1.8 [0.53] VFS: Cannot open root device (null) or unknown-block(0,0): error -6 [0.55] Please append a correct root= boot option; here are the available partitions: [0.55] Kernel panic - not syncing: VFS: Unable to mount root fs on unknown-block(0,0) [ 108.21] random: nonblocking pool is initialized -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] AsiaRF AWM002 (ramips) USB and reboot broken at r44044
John == John Crispin blo...@openwrt.org writes: John On 03/02/2015 08:36, Christian Lamparter wrote: Thing is: ralink-phy.c can use some more work! John elaborate on what needs work r44248 fixed my problem. Thanks, Christian and John! -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] AsiaRF AWM002 (ramips) USB and reboot broken sometime since r43960
I just wanted to give a heads up that I built trunk r44245 last night and discovered two problems: reboot no longer works, and USB fails to enumerate a usb-serial device that worked previously (specifically a pl2303). To successfully reset, a power cycle is required. These problems were not evident the last time I built, about 3 weeks ago, r43960. The lsmod output is nearly identical between working/not-working (with some minor fuzz in a few module sizes). I'm planning to try bisecting this, but if someone knows the problem and beats me to it, I'd be grateful. Bisecting is powerful but somewhat tedious. ;-) -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] AsiaRF AWM002 (ramips) USB and reboot broken at r44044
Russell == Russell Senior russ...@personaltelco.net writes: Russell I just wanted to give a heads up that I built trunk r44245 last Russell night and discovered two problems: reboot no longer works, and Russell USB fails to enumerate a usb-serial device that worked Russell previously (specifically a pl2303). To successfully reset, a Russell power cycle is required. These problems were not evident the Russell last time I built, about 3 weeks ago, r43960. The lsmod output Russell is nearly identical between working/not-working (with some Russell minor fuzz in a few module sizes). Russell I'm planning to try bisecting this, but if someone knows the Russell problem and beats me to it, I'd be grateful. Bisecting is Russell powerful but somewhat tedious. ;-) I bisected the problem. It appears the bad commit is r44044 (r44043 is good). The reset and usb problems appear at the same commit. commit fb038c46afa40edbd37eb9a93468312b287c5aa7 Author: nbd nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73 Date: Sun Jan 18 20:17:07 2015 + ralink: use fe_reset to control all reset Signed-off-by: michael lee igv...@gmail.com git-svn-id: svn://svn.openwrt.org/openwrt/trunk@44044 3c298f89-4303-0410-b956-a3cf2f4a3e73 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 1/3] iproute2: bump version to 3.18.0
Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 6 +++--- package/network/utils/iproute2/patches/300-ip_tiny.patch | 15 --- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 9aea05e..a49b061 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2014 OpenWrt.org +# Copyright (C) 2006-2015 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.17.0 +PKG_VERSION:=3.18.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=b741a02c6dda5818d18011d572874493 +PKG_MD5SUM:=6f6ad51a7880460e103367b16057 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 5b0d56c..3620120 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -1,6 +1,6 @@ --- a/ip/Makefile +++ b/ip/Makefile -@@ -15,6 +15,13 @@ ifeq ($(IP_CONFIG_SETNS),y) +@@ -16,6 +16,13 @@ ifeq ($(IP_CONFIG_SETNS),y) CFLAGS += -DHAVE_SETNS endif @@ -14,7 +14,7 @@ ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef TARGETS=ip rtmon -@@ -42,7 +49,7 @@ else +@@ -43,7 +50,7 @@ else ip: static-syms.o static-syms.o: static-syms.h @@ -25,7 +25,7 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, \1)) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -66,29 +66,41 @@ static const struct cmd { +@@ -69,30 +69,42 @@ static const struct cmd { int (*func)(int argc, char **argv); } cmds[] = { { address,do_ipaddr }, @@ -44,6 +44,7 @@ { link, do_iplink }, +#ifndef IPROUTE2_TINY { l2tp, do_ipl2tp }, + { fou,do_ipfou }, +#endif { tunnel, do_iptunnel }, { tunl, do_iptunnel }, @@ -69,7 +70,7 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -627,6 +627,7 @@ const char *rt_addr_n2a(int af, int len, +@@ -629,6 +629,7 @@ const char *rt_addr_n2a(int af, const vo case AF_INET: case AF_INET6: return inet_ntop(af, addr, buf, buflen); @@ -77,7 +78,7 @@ case AF_IPX: return ipx_ntop(af, addr, buf, buflen); case AF_DECnet: -@@ -635,6 +636,7 @@ const char *rt_addr_n2a(int af, int len, +@@ -637,6 +638,7 @@ const char *rt_addr_n2a(int af, const vo memcpy(dna.a_addr, addr, 2); return dnet_ntop(af, dna, buf, buflen); } @@ -85,7 +86,7 @@ default: return ???; } -@@ -710,6 +712,7 @@ const char *format_host(int af, int len, +@@ -712,6 +714,7 @@ const char *format_host(int af, int len, case AF_INET6: len = 16; break; @@ -93,7 +94,7 @@ case AF_IPX: len = 10; break; -@@ -720,6 +723,7 @@ const char *format_host(int af, int len, +@@ -722,6 +725,7 @@ const char *format_host(int af, int len, len = 2; break; #endif -- 2.1.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 2/3] iproute2: fix header problem for musl
iproute2 includes sanitized linux kernel headers, which work fine for uClibc, however with musl there is some header conflict, principally some ipv6 structure redefinition. This patch removes linux/in6.h from include/linux/if_bridge.h to solve the problem. Signed-off-by: Russell Senior russ...@personaltelco.net --- .../utils/iproute2/patches/910-sanitize_headers_for_musl.patch | 10 ++ 1 file changed, 10 insertions(+) create mode 100644 package/network/utils/iproute2/patches/910-sanitize_headers_for_musl.patch diff --git a/package/network/utils/iproute2/patches/910-sanitize_headers_for_musl.patch b/package/network/utils/iproute2/patches/910-sanitize_headers_for_musl.patch new file mode 100644 index 000..ca1125d --- /dev/null +++ b/package/network/utils/iproute2/patches/910-sanitize_headers_for_musl.patch @@ -0,0 +1,10 @@ +--- a/include/linux/if_bridge.h b/include/linux/if_bridge.h +@@ -15,7 +15,6 @@ + + #include linux/types.h + #include linux/if_ether.h +-#include linux/in6.h + + #define SYSFS_BRIDGE_ATTR bridge + #define SYSFS_BRIDGE_FDB brforward -- 2.1.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH v2 3/3] iproute2: add package for bridge program
The 'bridge' program has been part of iproute2 for a while, and it was once declared[1] to the the intended longterm replacement for bridge-utils, but its features are still mostly distinct[2] from the venerable brctl. [1] http://lwn.net/Articles/435845/ [2] http://sgros-students.blogspot.com/2013/11/comparison-of-brctl-and-bridge-commands.html Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 11 +++ 1 file changed, 11 insertions(+) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index a49b061..ad14ac4 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -58,6 +58,11 @@ $(call Package/iproute2/Default) TITLE:=General netlink utility frontend endef +define Package/ip-bridge +$(call Package/iproute2/Default) + TITLE:=Bridge configuration utility from iproute2 +endef + define Package/ss $(call Package/iproute2/Default) TITLE:=Socket statistics utility @@ -130,6 +135,11 @@ define Package/genl/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/genl/genl $(1)/usr/sbin/ endef +define Package/ip-bridge/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bridge/bridge $(1)/usr/sbin/ +endef + define Package/ss/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/ @@ -139,4 +149,5 @@ $(eval $(call BuildPackage,ip)) $(eval $(call BuildPackage,ip-full)) $(eval $(call BuildPackage,tc)) $(eval $(call BuildPackage,genl)) +$(eval $(call BuildPackage,ip-bridge)) $(eval $(call BuildPackage,ss)) -- 2.1.3 ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] iproute2: bump version to v3.18.0, add package for bridge program
Steven == Steven Barth cy...@openwrt.org writes: Steven Thanks, unfortunately this doesn't compile for me: Can you email me your .config? I'll confess I only test-built it with uClibc. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] iproute2: bump version to v3.18.0, add package for bridge program
Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 15 +-- package/network/utils/iproute2/patches/300-ip_tiny.patch | 15 --- 2 files changed, 21 insertions(+), 9 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 9aea05e..13b240e 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.17.0 +PKG_VERSION:=3.18.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=b741a02c6dda5818d18011d572874493 +PKG_MD5SUM:=6f6ad51a7880460e103367b16057 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 @@ -63,6 +63,11 @@ $(call Package/iproute2/Default) TITLE:=Socket statistics utility endef +define Package/ip-bridge +$(call Package/iproute2/Default) + TITLE:=Bridge utility from iproute2 +endef + ifeq ($(BUILD_VARIANT),tiny) IP_CONFIG_TINY:=y endif @@ -135,8 +140,14 @@ define Package/ss/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/misc/ss $(1)/usr/sbin/ endef +define Package/ip-bridge/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bridge/bridge $(1)/usr/sbin/ +endef + $(eval $(call BuildPackage,ip)) $(eval $(call BuildPackage,ip-full)) $(eval $(call BuildPackage,tc)) $(eval $(call BuildPackage,genl)) $(eval $(call BuildPackage,ss)) +$(eval $(call BuildPackage,ip-bridge)) diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 5b0d56c..3620120 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -1,6 +1,6 @@ --- a/ip/Makefile +++ b/ip/Makefile -@@ -15,6 +15,13 @@ ifeq ($(IP_CONFIG_SETNS),y) +@@ -16,6 +16,13 @@ ifeq ($(IP_CONFIG_SETNS),y) CFLAGS += -DHAVE_SETNS endif @@ -14,7 +14,7 @@ ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef TARGETS=ip rtmon -@@ -42,7 +49,7 @@ else +@@ -43,7 +50,7 @@ else ip: static-syms.o static-syms.o: static-syms.h @@ -25,7 +25,7 @@ sed -n '/'$$s'[^ ]* =/{s:.* \([^ ]*'$$s'[^ ]*\) .*:extern char \1[] __attribute__((weak)); if (!strcmp(sym, \1)) return \1;:;p}' $$files ; \ --- a/ip/ip.c +++ b/ip/ip.c -@@ -66,29 +66,41 @@ static const struct cmd { +@@ -69,30 +69,42 @@ static const struct cmd { int (*func)(int argc, char **argv); } cmds[] = { { address,do_ipaddr }, @@ -44,6 +44,7 @@ { link, do_iplink }, +#ifndef IPROUTE2_TINY { l2tp, do_ipl2tp }, + { fou,do_ipfou }, +#endif { tunnel, do_iptunnel }, { tunl, do_iptunnel }, @@ -69,7 +70,7 @@ }; --- a/lib/utils.c +++ b/lib/utils.c -@@ -627,6 +627,7 @@ const char *rt_addr_n2a(int af, int len, +@@ -629,6 +629,7 @@ const char *rt_addr_n2a(int af, const vo case AF_INET: case AF_INET6: return inet_ntop(af, addr, buf, buflen); @@ -77,7 +78,7 @@ case AF_IPX: return ipx_ntop(af, addr, buf, buflen); case AF_DECnet: -@@ -635,6 +636,7 @@ const char *rt_addr_n2a(int af, int len, +@@ -637,6 +638,7 @@ const char *rt_addr_n2a(int af, const vo memcpy(dna.a_addr, addr, 2); return dnet_ntop(af, dna, buf, buflen); } @@ -85,7 +86,7 @@ default: return ???; } -@@ -710,6 +712,7 @@ const char *format_host(int af, int len, +@@ -712,6 +714,7 @@ const char *format_host(int af, int len, case AF_INET6: len = 16; break; @@ -93,7 +94,7 @@ case AF_IPX: len = 10; break; -@@ -720,6 +723,7 @@ const char *format_host(int af, int len, +@@ -722,6 +725,7 @@ const char *format_host(int af, int len, len = 2; break; #endif -- 2.1.3 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] iproute2: bump version from 3.16.0 to 3.17.0
Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index f6d2801..9aea05e 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.16.0 +PKG_VERSION:=3.17.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=6c823b40fdcfa7b8120743349a52ac18 +PKG_MD5SUM:=b741a02c6dda5818d18011d572874493 PKG_BUILD_PARALLEL:=1 PKG_LICENSE:=GPL-2.0 -- 2.1.3 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] I'd like to donate a Netgear N150 WNR1000 v3
SGT == SGT Garcia darwinsker...@gmail.com writes: SGT first question, do i absolutely need a serial console to get an SGT interface with CFE? [...] SGT [...] this all has to wait for a while though. i can get back to this SGT towards the end of December when i have more time. in the mean time SGT please keep your ideas/suggestions coming. thanks for the help. Everyone should have one. At this price (or similar), there isn't a good reason to not have several: http://www.ebay.com/itm/USB-To-RS232-TTL-UART-PL2303HX-Auto-Converter-USB-to-COM-Cable-Adapter-Module-/310676792112 ... particularly if you've got some lead time, since coming from china might mean you need to wait a while. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] kernel changes on recompilation?
Nishant == Nishant Sharma codemarau...@gmail.com writes: Nishant [...] I never did a clean or dir clean but yes I enabled a Nishant few packages and modules with new requirements. Nishant Which is fine by my own thinking. And just for adding Nishant e.g. batman-adv to existing devices in the field, it becomes Nishant a pain to reflash them due to kernel hash change. Nishant Any more pointers please? I'm not sure this works, but it was once suggested that building all the otherwise unselected kernel modules as M would result in a consistent hash. If true, then you can add these to your image later, or install them later without the hash clash. Please test and report back :-) -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] out of date(?) links in openwrt wiki page, Wireless overview
Robert == Robert P J Day rpj...@crashcourse.ca writes: Robert in this section: Robert http://wiki.openwrt.org/doc/howto/wireless.overview#captive.portal.software.available.in.the.openwrt.repository Robert the first two links nocatauth and nocatsplash go nowhere. Robert actually, same with last three links -- the only two links Robert with pages are wifidog and nodogsplash. Robert are all of the solutions listed there still actively Robert supported? or should that list be culled somewhat? Our community wireless network still actively uses nocatauth. I am probably the defacto maintainer, and will eventually make a pull request for moving it to the github packages feed. Or we'll maintain it in a separate feed if necessary. Not sure about the state of the wiki. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: fix device-trees for AsiaRF awm002/3 evb
Revert some brain damage. The rx and tx LEDs on the eval board are not connected to the CPU, but to the FTDI chip instead. Therefore, they are not and cannot be under GPIO control. The LINK_0, LINK_1 LEDs are configured to be driven by the switch, and are not under GPIO control either, though they could be pinmux'd that way if needed. The WLAN LED is driven by the radio phy. Removes the completely fictitious ld1 and ld2 from AWM002.dtsi. Renames the remaining LED to a more generic asiarf, rather than the module name, because it is on the eval board and not on either of the AWM002 or AWM003. Renamed the reset_wps button to just reset, since it does not in practice function as a WPS button. This patch adds support for a mode event associated with the slider switch on the eval board, through the gpio-button-hotplug infrastructure. It also enables GPIO control of the second GPIO controller, in rt5350.dtsi, but does not use it. Signed-off-by: Russell Senior russ...@personaltelco.net --- .../gpio-button-hotplug/src/gpio-button-hotplug.c | 1 + target/linux/ramips/base-files/etc/board.d/01_leds | 4 +++- target/linux/ramips/dts/AWM002-EVB-4M.dts | 18 +- target/linux/ramips/dts/AWM002-EVB-8M.dts | 18 +- target/linux/ramips/dts/AWM002.dtsi| 12 target/linux/ramips/dts/AWM003-EVB.dts | 18 +- target/linux/ramips/dts/rt5350.dtsi| 2 -- 7 files changed, 19 insertions(+), 54 deletions(-) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index c997e35..891dd96 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -97,6 +97,7 @@ static struct bh_map button_map[] = { BH_MAP(KEY_RFKILL, rfkill), BH_MAP(KEY_WPS_BUTTON, wps), BH_MAP(KEY_WIMAX, wwan), + BH_MAP(BTN_MODE,mode), }; /* -*/ diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 01e2363..906769e 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -38,7 +38,9 @@ case $board in ucidef_set_led_rssi rssihigh RSSIHIGH all0256n:green:rssihigh wlan0 70 100 -69 8 set_wifi_led rt2800pci-phy0::radio ;; - awapn2403) + awapn2403|\ + awm002-evb|\ + awm003-evb) set_wifi_led rt2800soc-phy0::radio ;; ar725w) diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts index 0738f04..77621dc 100644 --- a/target/linux/ramips/dts/AWM002-EVB-4M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts @@ -15,17 +15,9 @@ gpio-leds { compatible = gpio-leds; - tx { - label = awm002-evb:green:tx; - gpios = gpio0 15 1; - }; - rx { - label = awm002-evb:green:rx; - gpios = gpio0 16 1; - }; wps { - label = awm002-evb:green:wps; - gpios = gpio0 21 1; + label = asiarf-evb:green:wps; + gpios = gpio0 21 0; }; }; @@ -34,15 +26,15 @@ #address-cells = 1; #size-cells = 0; poll-interval = 20; - reset_wps { - label = reset_wps; + reset { + label = reset; gpios = gpio0 0 1; linux,code = 0x198; }; mode { label = mode; gpios = gpio0 20 1; - linux,code = 0x32; + linux,code = 0x13c; }; }; }; diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts index ebc4085..a5a5e84 100644 --- a/target/linux/ramips/dts/AWM002-EVB-8M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts @@ -15,17 +15,9 @@ gpio-leds { compatible = gpio-leds; - tx { - label = awm002-evb:green:tx; - gpios = gpio0 15 1; - }; - rx { - label = awm002-evb:green:rx; - gpios = gpio0 16 1; - }; wps { - label = awm002-evb:green:wps; - gpios = gpio0 21 1; + label = asiarf-evb:green:wps
Re: [OpenWrt-Devel] [PATCHv2] ramips: fix device-trees for AsiaRF awm002/3 evb
Revert some brain damage. The rx and tx LEDs on the eval board are not connected to the CPU, but to the FTDI chip instead. Therefore, they are not and cannot be under GPIO control. The LINK_0, LINK_1 LEDs are configured to be driven by the switch, and are not under GPIO control either, though they could be pinmux'd that way if needed. The WLAN LED is driven by the radio phy. Removes the completely fictitious ld1 and ld2 from AWM002.dtsi. Renames the remaining LED to a more generic asiarf, rather than the module name, because it is on the eval board and not on either of the AWM002 or AWM003. Renamed the reset_wps button to just reset, since it does not in practice function as a WPS button. This patch adds support for a mode event associated with the slider switch on the eval board, through the gpio-button-hotplug infrastructure. Signed-off-by: Russell Senior russ...@personaltelco.net --- .../gpio-button-hotplug/src/gpio-button-hotplug.c | 1 + target/linux/ramips/base-files/etc/board.d/01_leds | 4 +++- target/linux/ramips/dts/AWM002-EVB-4M.dts | 18 +- target/linux/ramips/dts/AWM002-EVB-8M.dts | 18 +- target/linux/ramips/dts/AWM002.dtsi| 12 target/linux/ramips/dts/AWM003-EVB.dts | 18 +- 6 files changed, 19 insertions(+), 52 deletions(-) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index c997e35..891dd96 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -97,6 +97,7 @@ static struct bh_map button_map[] = { BH_MAP(KEY_RFKILL, rfkill), BH_MAP(KEY_WPS_BUTTON, wps), BH_MAP(KEY_WIMAX, wwan), + BH_MAP(BTN_MODE,mode), }; /* -*/ diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 01e2363..906769e 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -38,7 +38,9 @@ case $board in ucidef_set_led_rssi rssihigh RSSIHIGH all0256n:green:rssihigh wlan0 70 100 -69 8 set_wifi_led rt2800pci-phy0::radio ;; - awapn2403) + awapn2403|\ + awm002-evb|\ + awm003-evb) set_wifi_led rt2800soc-phy0::radio ;; ar725w) diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts index 0738f04..77621dc 100644 --- a/target/linux/ramips/dts/AWM002-EVB-4M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts @@ -15,17 +15,9 @@ gpio-leds { compatible = gpio-leds; - tx { - label = awm002-evb:green:tx; - gpios = gpio0 15 1; - }; - rx { - label = awm002-evb:green:rx; - gpios = gpio0 16 1; - }; wps { - label = awm002-evb:green:wps; - gpios = gpio0 21 1; + label = asiarf-evb:green:wps; + gpios = gpio0 21 0; }; }; @@ -34,15 +26,15 @@ #address-cells = 1; #size-cells = 0; poll-interval = 20; - reset_wps { - label = reset_wps; + reset { + label = reset; gpios = gpio0 0 1; linux,code = 0x198; }; mode { label = mode; gpios = gpio0 20 1; - linux,code = 0x32; + linux,code = 0x13c; }; }; }; diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts index ebc4085..a5a5e84 100644 --- a/target/linux/ramips/dts/AWM002-EVB-8M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts @@ -15,17 +15,9 @@ gpio-leds { compatible = gpio-leds; - tx { - label = awm002-evb:green:tx; - gpios = gpio0 15 1; - }; - rx { - label = awm002-evb:green:rx; - gpios = gpio0 16 1; - }; wps { - label = awm002-evb:green:wps; - gpios = gpio0 21 1; + label = asiarf-evb:green:wps; + gpios = gpio0 21 0; }; }; @@ -34,15 +26,15 @@ #address-cells = 1; #size-cells = 0; poll
Re: [OpenWrt-Devel] [PATCH] ramips: fix device-trees for AsiaRF awm002/3 evb
John == John Crispin blo...@openwrt.org writes: John On 17/09/2014 09:24, Russell Senior wrote: It also enables GPIO control of the second GPIO controller, in rt5350.dtsi, but does not use it. John that is why it is not enabled by default :) It could be used, which I did while testing. I don't understand the logic of disabling the second gpio controller for everyone that includes rt5350.dtsi. I don't understand the harm. Can you elaborate please? -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCHv3 1/3] ramips: fix device-trees for AsiaRF awm002/3 evb
Revert some brain damage. The rx and tx LEDs on the eval board are not connected to the CPU, but to the FTDI chip instead. Therefore, they are not and cannot be under GPIO control. The LINK_0, LINK_1 LEDs are configured to be driven by the switch, and are not under GPIO control either, though they could be pinmux'd that way if needed. The WLAN LED is driven by the radio phy. Removes the completely fictitious ld1 and ld2 from AWM002.dtsi. Renames the remaining LED to a more generic asiarf, rather than the module name, because it is on the eval board and not on either of the AWM002 or AWM003. Renamed the reset_wps button to just reset, since it does not in practice function as a WPS button. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/base-files/etc/board.d/01_leds | 4 +++- target/linux/ramips/dts/AWM002-EVB-4M.dts | 16 target/linux/ramips/dts/AWM002-EVB-8M.dts | 16 target/linux/ramips/dts/AWM002.dtsi| 12 target/linux/ramips/dts/AWM003-EVB.dts | 16 5 files changed, 15 insertions(+), 49 deletions(-) diff --git a/target/linux/ramips/base-files/etc/board.d/01_leds b/target/linux/ramips/base-files/etc/board.d/01_leds index 01e2363..906769e 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -38,7 +38,9 @@ case $board in ucidef_set_led_rssi rssihigh RSSIHIGH all0256n:green:rssihigh wlan0 70 100 -69 8 set_wifi_led rt2800pci-phy0::radio ;; - awapn2403) + awapn2403|\ + awm002-evb|\ + awm003-evb) set_wifi_led rt2800soc-phy0::radio ;; ar725w) diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts index 0738f04..5884779 100644 --- a/target/linux/ramips/dts/AWM002-EVB-4M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts @@ -15,17 +15,9 @@ gpio-leds { compatible = gpio-leds; - tx { - label = awm002-evb:green:tx; - gpios = gpio0 15 1; - }; - rx { - label = awm002-evb:green:rx; - gpios = gpio0 16 1; - }; wps { - label = awm002-evb:green:wps; - gpios = gpio0 21 1; + label = asiarf-evb:green:wps; + gpios = gpio0 21 0; }; }; @@ -34,8 +26,8 @@ #address-cells = 1; #size-cells = 0; poll-interval = 20; - reset_wps { - label = reset_wps; + reset { + label = reset; gpios = gpio0 0 1; linux,code = 0x198; }; diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts index ebc4085..3f6b20f 100644 --- a/target/linux/ramips/dts/AWM002-EVB-8M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts @@ -15,17 +15,9 @@ gpio-leds { compatible = gpio-leds; - tx { - label = awm002-evb:green:tx; - gpios = gpio0 15 1; - }; - rx { - label = awm002-evb:green:rx; - gpios = gpio0 16 1; - }; wps { - label = awm002-evb:green:wps; - gpios = gpio0 21 1; + label = asiarf-evb:green:wps; + gpios = gpio0 21 0; }; }; @@ -34,8 +26,8 @@ #address-cells = 1; #size-cells = 0; poll-interval = 20; - reset_wps { - label = reset_wps; + reset { + label = reset; gpios = gpio0 0 1; linux,code = 0x198; }; diff --git a/target/linux/ramips/dts/AWM002.dtsi b/target/linux/ramips/dts/AWM002.dtsi index e1579b5..5566d16 100644 --- a/target/linux/ramips/dts/AWM002.dtsi +++ b/target/linux/ramips/dts/AWM002.dtsi @@ -59,16 +59,4 @@ ohci@101c1000 { status = okay; }; - - gpio-leds { - compatible = gpio-leds; - ld1 { - label = asiarf:green:ld1; - gpios = gpio0 0 1; - }; - ld2 { - label = asiarf:green:ld2; - gpios = gpio0 1 1; - }; - }; }; diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts index 35d4886..bfb91b7 100644 --- a/target/linux/ramips/dts/AWM003-EVB.dts +++ b
[OpenWrt-Devel] [PATCHv3 2/3] [package] gpio-button-hotplug: Add a mode event
Signed-off-by: Russell Senior russ...@personaltelco.net --- package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c | 1 + 1 file changed, 1 insertion(+) diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index c997e35..891dd96 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -97,6 +97,7 @@ static struct bh_map button_map[] = { BH_MAP(KEY_RFKILL, rfkill), BH_MAP(KEY_WPS_BUTTON, wps), BH_MAP(KEY_WIMAX, wwan), + BH_MAP(BTN_MODE,mode), }; /* -*/ -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCHv3 3/3] ramips: slider switch on asiarf evb, send mode event
Uses the new mode event in gpio-button-hotplug. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/dts/AWM002-EVB-4M.dts | 2 +- target/linux/ramips/dts/AWM002-EVB-8M.dts | 2 +- target/linux/ramips/dts/AWM003-EVB.dts| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts index 5884779..77621dc 100644 --- a/target/linux/ramips/dts/AWM002-EVB-4M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts @@ -34,7 +34,7 @@ mode { label = mode; gpios = gpio0 20 1; - linux,code = 0x32; + linux,code = 0x13c; }; }; }; diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts index 3f6b20f..a5a5e84 100644 --- a/target/linux/ramips/dts/AWM002-EVB-8M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts @@ -34,7 +34,7 @@ mode { label = mode; gpios = gpio0 20 1; - linux,code = 0x32; + linux,code = 0x13c; }; }; }; diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts index bfb91b7..2303858 100644 --- a/target/linux/ramips/dts/AWM003-EVB.dts +++ b/target/linux/ramips/dts/AWM003-EVB.dts @@ -49,7 +49,7 @@ mode { label = mode; gpios = gpio0 20 1; - linux,code = 0x32; + linux,code = 0x13c; }; }; }; -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCHv3 2/3] [package] gpio-button-hotplug: Add a mode event
diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c index c997e35..891dd96 100644 --- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c +++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c @@ -97,6 +97,7 @@ static struct bh_map button_map[] = { BH_MAP(KEY_RFKILL, rfkill), BH_MAP(KEY_WPS_BUTTON, wps), BH_MAP(KEY_WIMAX, wwan), + BH_MAP(BTN_MODE,mode), }; /* -*/ -- 2.0.0 Hmm. If we used KEY_M here instead of horribly abusing BTN_MODE, the third patch would be unnecessary. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [package] iproute2: update from v3.15.0 to v3.16.0
Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index fc47159..ee4cd65 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.15.0 +PKG_VERSION:=3.16.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=5b1711c9d16071959052e369a2682d77 +PKG_MD5SUM:=6c823b40fdcfa7b8120743349a52ac18 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] autoconf: bump version to 2.69
Signed-off-by: Russell Senior russ...@personaltelco.net --- tools/autoconf/Makefile | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/autoconf/Makefile b/tools/autoconf/Makefile index f5d22c3..ec154e4 100644 --- a/tools/autoconf/Makefile +++ b/tools/autoconf/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,11 +7,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autoconf -PKG_VERSION:=2.68 +PKG_VERSION:=2.69 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@GNU/autoconf -PKG_MD5SUM:=864d785215aa60d627c91fcb21b05b07 +PKG_MD5SUM:=50f97f4159805e374639a73e2636f22e include $(INCLUDE_DIR)/host-build.mk -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Explanation of LED infrastructure
I am working with the AsiaRF AWM002/AWM003 modules (primarily the latter) in their EVB eval board. It seems that the LED configuration is broken. In the process of trying to figure out how to fix it, I'm confronted by the unfortunate reality that I don't understand how the full chain from DTS to blinking LEDs works. I am hoping that someone can clarify or at least clue-ify me so that I can fix my current problem and be in a position to fix future ones. I am referring to trunk, as of r41997. There is a DTS (target/linux/ramips/dts/AWM003-EVB.dts) for the board, which includes some LED configuration: gpio-leds { compatible = gpio-leds; tx { label = awm002-evb:green:tx; gpios = gpio0 15 1; }; rx { label = awm002-evb:green:rx; gpios = gpio0 16 1; }; wps { label = awm002-evb:green:wps; gpios = gpio0 21 1; }; }; However, on boot, these LEDs do not appear in sysfs. The contents of /sys/class/leds/ is: lrwxrwxrwx 1 root root 0 Aug 5 17:45 rt2800soc-phy0::assoc - ../../devices/1018.wmac/leds/rt2800soc-phy0::assoc lrwxrwxrwx 1 root root 0 Aug 5 17:45 rt2800soc-phy0::quality - ../../devices/1018.wmac/leds/rt2800soc-phy0::quality lrwxrwxrwx 1 root root 0 Aug 5 17:45 rt2800soc-phy0::radio - ../../devices/1018.wmac/leds/rt2800soc-phy0::radio These do not appear to be the same LEDs as in the DTS, which leads me to wonder how the hell the sysfs gets populated and what my build is missing. There is the additional infrastructure in: target/linux/ramips/base-files/etc/uci-defaults/01_leds and target/linux/ramips/base-files/etc/diag.sh but as far as I can tell, I am going off the rails earlier in the process (munging those didn't seem to help). The jump between the DTS and the sysfs is the magical part I am not understanding. If someone could explain that, I would most appreciate it. git grep'ing in the tree isn't finding where the connection is taking place for me, or what might be going wrong. Maybe the explanation for my non-workingness is that there is no connection? Thanks for any clues! -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 1/2] ramips: fix mode switch gpio for AsiaRF AWM eval board
Fix a typo: gpio 21 is already used for the WPS led. Gpio 20 is the right one (tested) for the mode switch. Confirmed that /sys/kernel/debug/gpio state followed the position of the switch. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/dts/AWM002-EVB-4M.dts | 2 +- target/linux/ramips/dts/AWM002-EVB-8M.dts | 2 +- target/linux/ramips/dts/AWM003-EVB.dts| 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/AWM002-EVB-4M.dts b/target/linux/ramips/dts/AWM002-EVB-4M.dts index 12887d8..cf686e5 100644 --- a/target/linux/ramips/dts/AWM002-EVB-4M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-4M.dts @@ -37,7 +37,7 @@ }; mode { label = mode; - gpios = gpio0 21 1; + gpios = gpio0 20 1; linux,code = 0x32; }; }; diff --git a/target/linux/ramips/dts/AWM002-EVB-8M.dts b/target/linux/ramips/dts/AWM002-EVB-8M.dts index 3be34bf..685b227 100644 --- a/target/linux/ramips/dts/AWM002-EVB-8M.dts +++ b/target/linux/ramips/dts/AWM002-EVB-8M.dts @@ -37,7 +37,7 @@ }; mode { label = mode; - gpios = gpio0 21 1; + gpios = gpio0 20 1; linux,code = 0x32; }; }; diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts index 4227965..35d4886 100644 --- a/target/linux/ramips/dts/AWM003-EVB.dts +++ b/target/linux/ramips/dts/AWM003-EVB.dts @@ -56,7 +56,7 @@ }; mode { label = mode; - gpios = gpio0 21 1; + gpios = gpio0 20 1; linux,code = 0x32; }; }; -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH 2/2] ramips: correct typo ubsphy - usbphy
This appears to be a typo. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/dts/mt7620a.dtsi | 2 +- target/linux/ramips/dts/mt7620n.dtsi | 2 +- target/linux/ramips/dts/rt5350.dtsi | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/target/linux/ramips/dts/mt7620a.dtsi b/target/linux/ramips/dts/mt7620a.dtsi index b2c2779..9d077ee 100644 --- a/target/linux/ramips/dts/mt7620a.dtsi +++ b/target/linux/ramips/dts/mt7620a.dtsi @@ -349,7 +349,7 @@ #reset-cells = 1; }; - ubsphy { + usbphy { compatible = ralink,mt7620a-usbphy; resets = rstctrl 22 rstctrl 25; diff --git a/target/linux/ramips/dts/mt7620n.dtsi b/target/linux/ramips/dts/mt7620n.dtsi index a88d9dc..8ce759a 100644 --- a/target/linux/ramips/dts/mt7620n.dtsi +++ b/target/linux/ramips/dts/mt7620n.dtsi @@ -223,7 +223,7 @@ #reset-cells = 1; }; - ubsphy { + usbphy { compatible = ralink,mt7620a-usbphy; resets = rstctrl 22 rstctrl 25; diff --git a/target/linux/ramips/dts/rt5350.dtsi b/target/linux/ramips/dts/rt5350.dtsi index 6abb271..e88f28d 100644 --- a/target/linux/ramips/dts/rt5350.dtsi +++ b/target/linux/ramips/dts/rt5350.dtsi @@ -237,7 +237,7 @@ #reset-cells = 1; }; - ubsphy { + usbphy { compatible = ralink,rt3xxx-usbphy; resets = rstctrl 22 rstctrl 25; -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: fix sysupgrade for asiarf awm003
Since the earlier r41797 change, the board_name for awm003 has been miscalculated, and sysupgrade has been broken. This seems to fix it. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/base-files/lib/ramips.sh | 3 +++ target/linux/ramips/base-files/lib/upgrade/platform.sh | 1 + 2 files changed, 4 insertions(+) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index f9ab1e3..ff3c2a5 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -55,6 +55,9 @@ ramips_board_detect() { *AsiaRF AWM002 EVB) name=awm002-evb ;; + *AsiaRF AWM003 EVB) + name=awm003-evb + ;; *AsiaRF AWAPN2403) name=awapn2403 ;; diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index 8ada58b..1ab3ab5 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -26,6 +26,7 @@ platform_check_image() { ar725w | \ asl26555 | \ awm002-evb | \ + awm003-evb | \ awapn2403 | \ bc2 | \ broadway | \ -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] MAC address on ramips?
We are playing with the AsiaRF AWM002 and AWM003 boards and recently discovered that the MAC addresses are the same across all of the boards we have. Initially, these seemed to be populated from the factory flash partition. Here is a hexdump -C of /dev/mtd2: 50 53 00 01 00 0c 43 30 50 f8 ff ff ff ff ff ff |PSC0P...| 0010 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff || 0020 ff ff ff ff ff ff ff ff 00 0c 43 30 50 77 00 0c |..C0Pw..| 0030 43 30 50 66 11 ff 24 28 ff ff 21 01 55 77 a8 aa |C0Pf..$(..!.Uw..| 0040 8c 88 ff ff 0c 00 00 00 00 00 00 00 00 00 ff ff || 0050 ff ff 0b 0b 0b 0b 0b 0b 0b 0b 0b 0b 0c 0c 0c 0c || 0060 ff ff ff ff ff ff ff ff ff ff ff ff ff ff 21 00 |..!.| 0070 00 00 00 00 00 00 03 90 ff ff ff ff ff ff ff ff || 0080 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff || * 00d0 ff ff ff ff ff ff ff ff ff ff ff ff ff ff 66 66 |..ff| 00e0 cc aa 88 66 cc aa 88 66 cc aa 88 66 cc aa 88 66 |...f...f...f...f| 00f0 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff || * 0120 81 09 1c 13 4f 15 4f 15 03 1d 07 1d ff ff ff ff |O.O.| 0130 ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff ff || * 0001 There are three portions, at offset 0x4 (wlan0), 0x28 (eth0) and 0x2e, that look like Ralink mac addresses. More recently, in the last week or so, the ethernet macs seem to have switched to 00:11:22:33:44:55 (and increments) as set in /etc/config/network stanzas. Can someone please explain what the idea/intention is here? Ultimately we may need to rewrite the factory partition to provide unique macaddrs for our project, if that's indeed where they ought to be coming from. Thanks! -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: add ethernet macaddr to dts for AWM003-EVB
Follows the pattern of http://patchwork.openwrt.org/patch/5970/ Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/dts/AWM003-EVB.dts | 4 1 file changed, 4 insertions(+) diff --git a/target/linux/ramips/dts/AWM003-EVB.dts b/target/linux/ramips/dts/AWM003-EVB.dts index 08157f5..4227965 100644 --- a/target/linux/ramips/dts/AWM003-EVB.dts +++ b/target/linux/ramips/dts/AWM003-EVB.dts @@ -20,6 +20,10 @@ }; }; + ethernet@1010 { + mtd-mac-address = factory 0x28; + }; + wmac@1018 { ralink,mtd-eeprom = factory 0; }; -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] ramips: fix vlan configuration for asiarf avm003
The earlier r41797 change was missing this part, to enable the right vlan configuration. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index b372893..85337c2 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -107,6 +107,7 @@ ramips_setup_interfaces() ;; awm002-evb | \ + awm003-evb | \ argus-atp52b | \ dir-645 | \ f5d8235-v1 | \ -- 2.0.0 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] OpenWRT IPv6 firewall
David == David Lang da...@lang.hm writes: David go do a tcpdump of your WAN interface some time, look at all David the attacks that are going on there (especially with an ISP David that's not blocking it for you) Bear in mind, scanning an IPv6 network is a self-inflicted denial-of-service attack. The universe will end before you finish testing the addresses on *one* /64 network. If someone has your host's globally routable IPv6 address, e.g. from observing your traffic, that's a bit different. But otherwise, unless you advertise your ipv6 address, it's very unlikely anyone is going to guess it. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] IEEE 802.11 TDMA mode support in OpenWRT
Ben == Ben West b...@gowasabi.net writes: Ben [...] Also, i believe TDMA requires very tight synchronization Ben between all radios, hence the inclusion of GPS modules on Ben proprietary implementations. Ubiquiti AirMax hardware does not have GPS, so it must be possible to do without. When we were stripping some SkyPilot hardware that we salvaged from a dead muni-wifi project, they included a GPS in each device. It is a shame the operator (MetroFi) didn't use the GPS to report the device locations, as cleaning up after them would have been much easier. We were told the primary purpose of the GPS was for timing. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] iproute2: update version to 3.15.0, refresh patches, add maintainer
Signed-off-by: Russell Senior russ...@personaltelco.net --- package/network/utils/iproute2/Makefile | 9 + package/network/utils/iproute2/patches/006-no_sctp.patch | 4 ++-- package/network/utils/iproute2/patches/110-extra-ccopts.patch| 2 +- package/network/utils/iproute2/patches/200-add-tc_esfq.patch | 2 +- .../network/utils/iproute2/patches/210-add-act_connmark.patch| 4 ++-- package/network/utils/iproute2/patches/300-ip_tiny.patch | 4 ++-- 6 files changed, 13 insertions(+), 12 deletions(-) diff --git a/package/network/utils/iproute2/Makefile b/package/network/utils/iproute2/Makefile index 7cc2fb4..558855f 100644 --- a/package/network/utils/iproute2/Makefile +++ b/package/network/utils/iproute2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2013 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=iproute2 -PKG_VERSION:=3.11.0 +PKG_VERSION:=3.15.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=http://kernel.org/pub/linux/utils/net/iproute2/ -PKG_MD5SUM:=d7ffb27bc9f0d80577b1f3fb9d1a7689 +PKG_MD5SUM:=5b1711c9d16071959052e369a2682d77 PKG_BUILD_PARALLEL:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) @@ -24,8 +24,9 @@ define Package/iproute2/Default TITLE:=Routing control utility ($(2)) SECTION:=net CATEGORY:=Network - URL:=http://linux-net.osdl.org/index.php/Iproute2 + URL:=http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2 SUBMENU:=Routing and Redirection + MAINTAINER:=Russell Senior russ...@personaltelco.net DEPENDS:= +libnl-tiny VARIANT:=$(1) endef diff --git a/package/network/utils/iproute2/patches/006-no_sctp.patch b/package/network/utils/iproute2/patches/006-no_sctp.patch index a3ed890..d4a0de0 100644 --- a/package/network/utils/iproute2/patches/006-no_sctp.patch +++ b/package/network/utils/iproute2/patches/006-no_sctp.patch @@ -1,6 +1,6 @@ --- a/ip/ipxfrm.c +++ b/ip/ipxfrm.c -@@ -470,7 +470,6 @@ void xfrm_selector_print(struct xfrm_sel +@@ -469,7 +469,6 @@ void xfrm_selector_print(struct xfrm_sel switch (sel-proto) { case IPPROTO_TCP: case IPPROTO_UDP: @@ -8,7 +8,7 @@ case IPPROTO_DCCP: default: /* XXX */ if (sel-sport_mask) -@@ -1283,7 +1282,6 @@ static int xfrm_selector_upspec_parse(st +@@ -1282,7 +1281,6 @@ static int xfrm_selector_upspec_parse(st switch (sel-proto) { case IPPROTO_TCP: case IPPROTO_UDP: diff --git a/package/network/utils/iproute2/patches/110-extra-ccopts.patch b/package/network/utils/iproute2/patches/110-extra-ccopts.patch index 4a08757..0e36230 100644 --- a/package/network/utils/iproute2/patches/110-extra-ccopts.patch +++ b/package/network/utils/iproute2/patches/110-extra-ccopts.patch @@ -7,5 +7,5 @@ -CCOPTS = -O2 +CCOPTS = -O2 $(EXTRA_CCOPTS) WFLAGS := -Wall -Wstrict-prototypes -Wmissing-prototypes - WFLAGS += -Wmissing-declarations -Wold-style-definition + WFLAGS += -Wmissing-declarations -Wold-style-definition -Wformat=2 diff --git a/package/network/utils/iproute2/patches/200-add-tc_esfq.patch b/package/network/utils/iproute2/patches/200-add-tc_esfq.patch index f09b450..19d8199 100644 --- a/package/network/utils/iproute2/patches/200-add-tc_esfq.patch +++ b/package/network/utils/iproute2/patches/200-add-tc_esfq.patch @@ -10,7 +10,7 @@ TCMODULES += q_tbf.o --- a/include/linux/pkt_sched.h +++ b/include/linux/pkt_sched.h -@@ -222,6 +222,33 @@ struct tc_sfq_xstats { +@@ -226,6 +226,33 @@ struct tc_sfq_xstats { __s32 allot; }; diff --git a/package/network/utils/iproute2/patches/210-add-act_connmark.patch b/package/network/utils/iproute2/patches/210-add-act_connmark.patch index ac6ba33..c0bf07a 100644 --- a/package/network/utils/iproute2/patches/210-add-act_connmark.patch +++ b/package/network/utils/iproute2/patches/210-add-act_connmark.patch @@ -1,13 +1,13 @@ --- a/tc/Makefile +++ b/tc/Makefile -@@ -38,6 +38,7 @@ TCMODULES += m_mirred.o +@@ -39,6 +39,7 @@ TCMODULES += m_mirred.o TCMODULES += m_nat.o TCMODULES += m_pedit.o TCMODULES += m_skbedit.o +TCMODULES += m_connmark.o TCMODULES += m_csum.o + TCMODULES += m_simple.o TCMODULES += p_ip.o - TCMODULES += p_icmp.o --- /dev/null +++ b/tc/m_connmark.c @@ -0,0 +1,74 @@ diff --git a/package/network/utils/iproute2/patches/300-ip_tiny.patch b/package/network/utils/iproute2/patches/300-ip_tiny.patch index 43afb9c..5b0d56c 100644 --- a/package/network/utils/iproute2/patches/300-ip_tiny.patch +++ b/package/network/utils/iproute2/patches/300-ip_tiny.patch @@ -14,7 +14,7 @@ ALLOBJ=$(IPOBJ) $(RTMONOBJ) SCRIPTS=ifcfg rtpr routel routef TARGETS=ip rtmon -@@ -43,7 +50,7 @@ else +@@ -42,7 +49,7 @@ else ip: static
[OpenWrt-Devel] [PATCH] Restore AWM002-EVB profile in asiarf.mk
In a recent revision (r41177) John Crispin removed the profile for the AsiaRF AWM002 eval board while adding another AsiaRF board. This patch restores AWM002 and also corrects a misspelling and an apparently errant reference to an Allnet ALL0239-3G device. Signed-off-by: Galen Seitz gal...@seitzassoc.com Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/rt305x/profiles/asiarf.mk | 15 +-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/target/linux/ramips/rt305x/profiles/asiarf.mk b/target/linux/ramips/rt305x/profiles/asiarf.mk index 2d5231d..8aef8a8 100644 --- a/target/linux/ramips/rt305x/profiles/asiarf.mk +++ b/target/linux/ramips/rt305x/profiles/asiarf.mk @@ -5,12 +5,23 @@ # See /LICENSE for more information. # +define Profile/AWM002EVB + NAME:=AsiaRF AWM002-EVB + PACKAGES:=kmod-usb-core kmod-usb-ohci kmod-usb2 kmod-ledtrig-usbdev \ + kmod-i2c-core kmod-i2c-gpio +endef + +define Profile/AWM002EVB/Description + Package set for AsiaRF AWM002 Evaluation Board +endef + define Profile/AWAPN2403 - NAME:=AisaRF AWAPN2403 + NAME:=AsiaRF AWAPN2403 endef define Profile/AWAPN2403/Description - Package set for Allnet ALL0239-3G + Package set for AsiaRF AWAPN2403 Pocket Router endef +$(eval $(call Profile,AWM002EVB)) $(eval $(call Profile,AWAPN2403)) -- 1.7.1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [ramips] add vlan configuration for asiarf awm002-evb
Without this, the ports all end up on vlan 1. This enables a separate WAN port that works. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/ramips/base-files/etc/uci-defaults/02_network | 1 + 1 file changed, 1 insertion(+) diff --git a/target/linux/ramips/base-files/etc/uci-defaults/02_network b/target/linux/ramips/base-files/etc/uci-defaults/02_network index 0c3daff..7612857 100755 --- a/target/linux/ramips/base-files/etc/uci-defaults/02_network +++ b/target/linux/ramips/base-files/etc/uci-defaults/02_network @@ -103,6 +103,7 @@ ramips_setup_interfaces() ucidef_add_switch_vlan switch0 2 4 6t ;; + awm002-evb | \ argus-atp52b | \ dir-645 | \ f5d8235-v1 | \ -- 1.8.3.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Support for Nanostation M2 devices
valent == valent turkovic@gmail com valent.turko...@gmail.com writes: valent@Gregor from Wlan Slovenia showed mi his boot log and I valent found here some references that other people are starting to valent notice change from ar724 to ar934x on their Ubiquiti devices: valent http://community.tanaza.com/tanaza/topics/installing_tanaza_firmware_on_unifi_ap valent http://www.wifi4you.com/Amp/UBiQUiTi-Firmware.html Maybe it valent takes some time for the paperwork to clear and to be show on valent FCC website? The first link is talking about UniFi devices, not Nanostation M. The second link has this: SOC AR7240 - MIPS 24K 400 MHz - Used in all legacy airMAX/airROUTERS/ToughSwitches AR9342 - MIPS 74K 550 MHz - I think this is in the Titanium AR9344 - MIPS 74K 560 MHz - I think this is in the NanoBeams The Nanostation M's are airMAX devices, so, afaict, no change. In any case there seems to be existing support for ar934x-based devices within the ar71xx target space, according to: git grep ar934 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [PATCH] [packages] libftdi: disable C++ bindings
Dirk == Dirk Neukirchen dirkneukirc...@web.de writes: Dirk alternatively deactivate building of libftdi++ during which the Dirk error happens +1 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] libftdi: disable boost to prevent build failure in c++ land
At least on ar71xx, if libftdi finds Boost, it tries to compile C++ libraries and dies horribly on some bogus looking assembler instructions. Disabling boost allows libftdi to build. Signed-off-by: Russell Senior russ...@personaltelco.net --- libs/libftdi/Makefile| 2 +- libs/libftdi/patches/200-disable_boost.patch | 11 +++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 libs/libftdi/patches/200-disable_boost.patch diff --git a/libs/libftdi/Makefile b/libs/libftdi/Makefile index 7bf5b2b..f35eb9d 100644 --- a/libs/libftdi/Makefile +++ b/libs/libftdi/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libftdi PKG_VERSION:=0.19 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ diff --git a/libs/libftdi/patches/200-disable_boost.patch b/libs/libftdi/patches/200-disable_boost.patch new file mode 100644 index 000..677a281 --- /dev/null +++ b/libs/libftdi/patches/200-disable_boost.patch @@ -0,0 +1,11 @@ +--- a/ftdipp/CMakeLists.txt b/ftdipp/CMakeLists.txt +@@ -16,7 +16,7 @@ if (FTDIPP) + set(cpp_headers ftdi.hpp) + + # Find Boost +-find_package(Boost) ++# find_package(Boost) + if(Boost_FOUND) + set(FTDI_BUILD_CPP True PARENT_SCOPE) + message(STATUS Building libftdi++) -- 1.8.3.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] mutt: add a mailpath to configuration to fix build
Not sure who is insane enough to store and read mail on an openwrt device, but this patch at least lets mutt build so they can try. The mailpath directory was made up. If someone knows a mailpath that makes more sense, please substitute. Signed-off-by: Russell Senior russ...@personaltelco.net --- mail/mutt/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index eb7381d..3792a51 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -37,11 +37,13 @@ CONFIGURE_ARGS += \ --oldincludedir=$(PKG_BUILD_DIR)/. \ --enable-pop \ --enable-imap \ + --with-mailpath=/usr/spool/mail \ --with-ssl \ --without-idn define Package/mutt/install $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/spool/mail $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mutt $(1)/usr/bin/ endef -- 1.8.3.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] etherpuppet: correct broken url
Signed-off-by: Russell Senior russ...@personaltelco.net --- net/etherpuppet/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/etherpuppet/Makefile b/net/etherpuppet/Makefile index f85f9d2..0851f84 100644 --- a/net/etherpuppet/Makefile +++ b/net/etherpuppet/Makefile @@ -13,7 +13,7 @@ PKG_VERSION:=0.3_r$(PKG_REV) PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://hg.secdev.org/etherpuppet +PKG_SOURCE_URL:=https://bitbucket.org/secdev/etherpuppet PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=hg -- 1.8.3.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] bemused: fix build by including more include files
Signed-off-by: Russell Senior russ...@personaltelco.net --- utils/bemused/Makefile | 4 ++-- utils/bemused/patches/110-missing_includes.patch | 19 +++ 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/utils/bemused/Makefile b/utils/bemused/Makefile index 61cc101..c30c7c3 100644 --- a/utils/bemused/Makefile +++ b/utils/bemused/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bemused-mpd PKG_VERSION:=r062 -PKG_RELEASE:=4 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/526 diff --git a/utils/bemused/patches/110-missing_includes.patch b/utils/bemused/patches/110-missing_includes.patch index c049e36..7f14a42 100644 --- a/utils/bemused/patches/110-missing_includes.patch +++ b/utils/bemused/patches/110-missing_includes.patch @@ -1,11 +1,22 @@ -diff -urN bemused-mpd-r062/main.cpp bemused-mpd-r062.new/main.cpp bemused-mpd-r062/main.cpp 2008-02-23 08:01:38.0 +0100 -+++ bemused-mpd-r062.new/main.cpp 2010-03-29 13:00:07.0 +0200 -@@ -16,6 +16,7 @@ +--- a/main.cpp b/main.cpp +@@ -16,6 +16,9 @@ ***/ #include stdlib.h +#include stdio.h ++#include getopt.h ++#include unistd.h #include iostream #include BemusedServerDlg.h +--- a/BemusedServerDlg.cpp b/BemusedServerDlg.cpp +@@ -28,6 +28,7 @@ + #include cerrno + #include csignal + ++#include unistd.h + #include sys/types.h + #include sys/stat.h + #include dirent.h -- 1.8.3.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] weechat: add missing dependencies to fix build
Signed-off-by: Russell Senior russ...@personaltelco.net --- net/weechat/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/net/weechat/Makefile b/net/weechat/Makefile index d5dec7a..055c598 100644 --- a/net/weechat/Makefile +++ b/net/weechat/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=weechat PKG_VERSION:=0.4.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.weechat.org/files/src @@ -27,7 +27,7 @@ define Package/weechat CATEGORY:=Network TITLE:=Lightweight IRC client URL:=http://www.weechat.org/ - DEPENDS:=+libcurl +libgnutls +libncursesw $(ICONV_DEPENDS) + DEPENDS:=+libcurl +libgnutls +libncursesw +libgcrypt +zlib $(ICONV_DEPENDS) endef define Package/weechat/description -- 1.8.3.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [routing] olsrd: bump version to 0.6.6.1, remove redundant patch
Signed-off-by: Russell Senior russ...@personaltelco.net diff --git a/olsrd/Makefile b/olsrd/Makefile index e7f4615..8643370 100644 --- a/olsrd/Makefile +++ b/olsrd/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=olsrd -PKG_VERSION:=0.6.6 -PKG_RELEASE:=3 +PKG_VERSION:=0.6.6.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.olsr.org/releases/0.6 -PKG_MD5SUM:=f98e5a10f1842f6028023da114bf1e1a +PKG_MD5SUM:=ef480495f307232f1df931ae5df18bf9 PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk diff --git a/olsrd/patches/001-fix-jsoninfo.patch b/olsrd/patches/001-fix-jsoninfo.patch deleted file mode 100644 index 52dfb0b..000 --- a/olsrd/patches/001-fix-jsoninfo.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/lib/jsoninfo/src/olsrd_jsoninfo.c b/lib/jsoninfo/src/olsrd_jsoninfo.c -index 3f7b7b9..966292c 100644 a/lib/jsoninfo/src/olsrd_jsoninfo.c -+++ b/lib/jsoninfo/src/olsrd_jsoninfo.c -@@ -1283,7 +1283,7 @@ send_info(unsigned int send_what, int the_socket) - abuf_init(abuf, 32768); - - // only add if outputing JSON -- if (send_what SIW_ALL) abuf_json_open_array_entry(abuf); -+ if (send_what SIW_ALL) abuf_puts(abuf, {); - - if ((send_what SIW_LINKS) == SIW_LINKS) ipc_print_links(abuf); - if ((send_what SIW_NEIGHBORS) == SIW_NEIGHBORS) ipc_print_neighbors(abuf); -@@ -1305,7 +1305,7 @@ send_info(unsigned int send_what, int the_socket) - abuf_json_int(abuf, timeSinceStartup, now_times); - if(*uuid != 0) - abuf_json_string(abuf, uuid, uuid); --abuf_json_close_array_entry(abuf); -+ abuf_puts(abuf, }\n); - } - - /* this outputs the olsrd.conf text directly, not JSON */ -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC] menuconfig policy?
Bastian == Bastian Bittorf bitt...@bluebottle.com writes: Russell That's possible. But it still means a substantial change in Russell behavior for users. Previously, selecting kmod-batman-adv Russell alone gave you batctl (similar to the userspace parts of Russell madwifi, iirc). I'm afraid users are going to miss batctl Russell unless there is some stronger linkage. Bastian what about having a suboption in the kmodule saying [ ] Bastian disable building batctl/userspace-tool Kernel modules --- Network Support --- would look something like this: * kmod-batman-adv. B.A.T.M.A.N. Adv [ ] enable verbose debug logging (NEW) [*] enable bridge loop avoidance (NEW) [*] enable distributed arp table (NEW) [ ] enable network coding [requires promisc mode support] (NEW) enable batctl while at the same time, in: Network --- you would see this: batctl B.A.T.M.A.N. Advanced user space configuration tool batctl where enable batctl and batcl toggle the same CONFIG_PACKAGE_batctl, in two different places. I'm just wondering if having a userspace package selection in the Kernel modules/Network Support section as well as in the Network section is beyond the pale or acceptable. I'm suggesting to accept it, because it seems the most natural of the alternatives. ACK/NACK? Should I assume silence equals assent? -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] [RFC] menuconfig policy?
Bastian == Bastian Bittorf bitt...@bluebottle.com writes: Russell That's possible. But it still means a substantial change in Russell behavior for users. Previously, selecting kmod-batman-adv Russell alone gave you batctl (similar to the userspace parts of Russell madwifi, iirc). I'm afraid users are going to miss batctl Russell unless there is some stronger linkage. Bastian what about having a suboption in the kmodule saying [ ] Bastian disable building batctl/userspace-tool Kernel modules --- Network Support --- would look something like this: * kmod-batman-adv. B.A.T.M.A.N. Adv [ ] enable verbose debug logging (NEW) [*] enable bridge loop avoidance (NEW) [*] enable distributed arp table (NEW) [ ] enable network coding [requires promisc mode support] (NEW) enable batctl while at the same time, in: Network --- you would see this: batctl B.A.T.M.A.N. Advanced user space configuration tool batctl where enable batctl and batcl toggle the same CONFIG_PACKAGE_batctl, in two different places. I'm just wondering if having a userspace package selection in the Kernel modules/Network Support section as well as in the Network section is beyond the pale or acceptable. I'm suggesting to accept it, because it seems the most natural of the alternatives. ACK/NACK? -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] how do I troubleshoot Kernel Panic
Alan == Alan Hoo huqings...@ycmedia.cn writes: AlanDear all: I've got a question about kernel panic. When I test Alan my driver module on OpenWRT( version : attitude adjustment) and Alan soon I was found the system reboot suddenly. how do I Alan troubleshoot ? Thank you in Advance. In: Global settings settings --- [*] Compile the kernel with symbol table information (CONFIG_KERNEL_KALLSYMS=y) [*] Compile the kernel with debug information (CONFIG_KERNEL_DEBUG_INFO=y) and attach a serial console, for example, using screen and make sure to enable console logging. Then make it panic. This will give you a hopefully-meaningful stack trace. That should give you clues to where things are going wrong. -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] atheros: change LINUX_VERSON from 3.8.13 to 3.10.28
The 3.10.x infrastructure has been present for some time, and seems to run fine here. Signed-off-by: Russell Senior russ...@personaltelco.net --- target/linux/atheros/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/atheros/Makefile b/target/linux/atheros/Makefile index 3f4bcd0..399834b 100644 --- a/target/linux/atheros/Makefile +++ b/target/linux/atheros/Makefile @@ -11,7 +11,7 @@ BOARD:=atheros BOARDNAME:=Atheros AR231x/AR5312 FEATURES:=squashfs -LINUX_VERSION:=3.8.13 +LINUX_VERSION:=3.10.28 include $(INCLUDE_DIR)/target.mk -- 1.8.1.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] [PATCH] [packages] curl: update to 7.35.0, fixes CVE-2014-0015
Spotted this on my twitter feed, so i guess it is good for something. http://curl.haxx.se/docs/adv_20140129.html Signed-off-by: Russell Senior russ...@personaltelco.net --- libs/curl/Makefile | 8 libs/curl/patches/100-check_long_long.patch | 2 +- libs/curl/patches/200-no_docs_tests.patch | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/libs/curl/Makefile b/libs/curl/Makefile index d435ccd..4ec9fb4 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2013 OpenWrt.org +# Copyright (C) 2007-2014 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.33.0 -PKG_RELEASE:=4 +PKG_VERSION:=7.35.0 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ @@ -18,7 +18,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=57409d6bf0bd97053b8378dbe0cadcef +PKG_MD5SUM:=c18fbdd031adb0529ae09fce399f2d10 PKG_LICENSE:=MIT PKG_LICENSE_FILES:=COPYING diff --git a/libs/curl/patches/100-check_long_long.patch b/libs/curl/patches/100-check_long_long.patch index f9088d8..863a66a 100644 --- a/libs/curl/patches/100-check_long_long.patch +++ b/libs/curl/patches/100-check_long_long.patch @@ -1,6 +1,6 @@ --- a/configure.ac +++ b/configure.ac -@@ -2889,6 +2889,7 @@ +@@ -2898,6 +2898,7 @@ CURL_VERIFY_RUNTIMELIBS AC_CHECK_SIZEOF(size_t) AC_CHECK_SIZEOF(long) diff --git a/libs/curl/patches/200-no_docs_tests.patch b/libs/curl/patches/200-no_docs_tests.patch index 43fd812..2287215 100644 --- a/libs/curl/patches/200-no_docs_tests.patch +++ b/libs/curl/patches/200-no_docs_tests.patch @@ -11,7 +11,7 @@ pkgconfig_DATA = libcurl.pc --- a/Makefile.in +++ b/Makefile.in -@@ -494,7 +494,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak +@@ -506,7 +506,7 @@ EXTRA_DIST = CHANGES COPYING maketgz Mak CLEANFILES = $(VC6LIBDSP) $(VC8LIBPRJ) bin_SCRIPTS = curl-config SUBDIRS = lib src include @@ -19,4 +19,4 @@ +DIST_SUBDIRS = $(SUBDIRS) packages pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libcurl.pc - CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c \ + VSOURCES = vtls/openssl.c vtls/gtls.c vtls/vtls.c vtls/nss.c vtls/qssl.c \ -- 1.8.1.2 -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Basic Package/Feed Workflow
Chad == Chad Monroe c...@monroe.io writes: Chad [...] The core problem I need to solve is how to compile/test a Chad package and make change after change after change to it, then Chad when itas ready, create a patch set. I have a feeling Iave been Chad doing things the hard way for a while and would appreciate a Chad push in the right direction. I love what OpenWRT is doing for Chad the community and an more than happy to contribute back; if this Chad is something that isnat in a wiki and should be Iam more than Chad happy to document it if someone can help me get the procedure Chad straight. Thanks for your time, Is this what you are looking for? http://wiki.openwrt.org/doc/devel/patches#iteratively.modify.patches.without.cleaning.the.source.tree -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] Netgear WGT634U broken in trunk
I tried building/running recent trunk for the venerable Netgear WGT634U, and discovered that it doesn't boot, or at least I lose the console right away. The last thing I see on the screen is: CFE version 1.0.34 for BCM95365R (32bit,SP,LE) Build Date: Tue Feb 24 03:21:41 CST 2004 (root@jackylinux) Copyright (C) 2000,2001,2002 Broadcom Corporation. Add MAC client version(DNI). Initializing Arena. Initializing Devices. et0: Broadcom BCM47xx 10/100 Mbps Ethernet Controller CPU type 0x29007: 200MHz Total memory: 0x200 bytes (32MB) Total memory used by CFE: 0x81BB1280 - 0x8200 (4517248) Initialized Data: 0x81BB1280 - 0x81BB3E90 (11280) BSS Area: 0x81BB3E90 - 0x81BB45D0 (1856) Local Heap:0x81BB45D0 - 0x81FB45D0 (4194304) Stack Area:0x81FB45D0 - 0x81FB65D0 (8192) Text (code) segment: 0x81FB65E0 - 0x81B0 (301520) Boot area (physical): 0x01B7 - 0x01BB Relocation Factor: I:E23B65E0 - D:01BB0280 configure vlans * *** VLAN Driver initial * Process LAN port(2-5) vlan Architecture... SUCCESS: trying to create VLAN 0 for switch SUCCESS: trying to add LAN port Process WAN port(2-5) vlan Architecture... SUCCESS: trying to create VLAN 0 for switch SUCCESS: trying to add WAN port SUCCESS: enable ports success configure vlans...done Device eth0: hwaddr 00-0F-B5-3D-5B-58, ipaddr 192.168.1.1, mask 255.255.255.0 gateway not set, nameserver not set Loader:elf Filesys:raw Dev:flash0.os File: Options:(null) *** MAC Client V1.0 *** et0macaddr value :flag =0 value=00-0f-b5-3d-5b-58 et1macaddr value :flag =0 value=00-0f-b5-3d-5b-59 MAC exist at least one system ethernet mac exist and not default Skip mac client process. Loading: 0x8000/8188 Entry at 0x80001000 Closing network. et0: link down Starting program at 0x80001000 and then it hangs indefinitely. I bisected this, with a vanilla configuration, distclean'ing in between each build. These are the results: r38308 boots, r38309 doesn't build, r38310 builds but doesn't boot on wgt634u where doesn't boot means the console hang after Starting program at ... Testing earlier versions, where it does boot, I find that with the default network configuration I cannot (from a serial console) ping hosts on the test device's local network, with the exception of the default gateway, but I can ping devices off the local network (e.g. 4.2.2.2). If I remove the switch configuration from /etc/config/network, I get a plain eth0 interface, which gets a DHCP lease and can ping local and non-local hosts. I have a box of these devices, and therefore enthusiastic about getting OpenWrt working with them again. I will be happy to work to help fix the problem. Let me know if I left out any pertinent details. I'll be around on the IRC channel during waking hours US West Coast time. Thanks! -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
Re: [OpenWrt-Devel] Netgear WGT634U broken in trunk
Hauke == Hauke Mehrtens ha...@hauke-m.de writes: Hauke Thanks for reporting the problem. The Fixes are now committed Hauke in r38793 and r38794. Those didn't fix my console problem. Applying the patch below before or after r38793 r38794 gives me a serial console back (provided for information, not application ;-). diff --git a/target/linux/brcm47xx/patches-3.10/082-MIPS-BCM47XX-add-EARLY_PRINTK_8250-support.patch b/target/linux/brcm47xx/patches-3.10/082-MIPS-BCM47XX-add-EARLY_PRINTK_8250-support.patch index 42f5917..6250c0e 100644 --- a/target/linux/brcm47xx/patches-3.10/082-MIPS-BCM47XX-add-EARLY_PRINTK_8250-support.patch +++ b/target/linux/brcm47xx/patches-3.10/082-MIPS-BCM47XX-add-EARLY_PRINTK_8250-support.patch @@ -42,7 +42,7 @@ Date: Thu Sep 19 22:48:35 2013 +0200 + * This is the first serial on the chip common core, it is at this position + * for sb (ssb) and ai (bcma) bus. + */ -+#define BCM47XX_SERIAL_ADDR (SSB_ENUM_BASE + SSB_CHIPCO_UART0_DATA) ++#define BCM47XX_SERIAL_ADDR (SSB_ENUM_BASE + SSB_CHIPCO_UART1_DATA) + void __init prom_init(void) { -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
[OpenWrt-Devel] bloatie-bloat-bloat?
I have a number of (admittedly) ancient Netgear WGT634U's in the field doing duty as free-wifi hotspots. Recent builds of our standard set of tools have become unhappy in the last year or so. For example, here are the RES memory sizes of processes on our workload, comparing r37911 (current) with r34240 (circa Nov 18, 2012): r37911 r34240 RSS commandRSS command 3700 gateway3000 gateway (nocatauth, w/ perl) 1400 snmpd 1240 snmpd 1196 openvpn3400 openvpn 736 olsrd 628 olsrd 732 olsrd 572 olsrd 664 netifd 268 netifd 656 procd 76 init 104 init 108 rcS 632 top612 top 532 dropbear 540 dropbear 496 ash480 ash 492 logread168 syslogd 488 hostapd392 hostapd 456 crond 332 crond 448 udhcpc * (used static config, so no udhcpc) 248 hotplug2 420 dropbear 188 dropbear 384 logger 172 logger 164 logger 380 sh 376 dnsmasq440 dnsmasq 372 radvd 188 radvd 256 radvd 320 radvd 364 ntpclient 200 ntpclient 280 ubusd 56 ubusd 272 sleep 224 askfirst 68 ?? 84 watchdog - - 15956 14048 Today's resident size is almost 2 megabytes larger than a year ago, even after a substantial improvement in the openvpn size (I switched to polarssl). Admittedly, the numbers are just a convenience sample (r37911 just booted, r34240 has been up for 44 days) and might not be a fair comparison in all cases. But, the direction here seems to be making the WGT634U less viable for us. Are these numbers illuminating at all? -- Russell Senior, President russ...@personaltelco.net ___ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel