[LEDE-DEV] [PATCH] dropbear: Fix append_port in IPv6 case (v2)
The new IPPort parameter allows to pass unchanged parameters to dropbear, dropbear uses -p [ip6]:port for IPv6 and this was not supported with existing scripts. Fix indentation and missing then of previous patch. Signed-off-by: Laurent GUERBY--- package/network/services/dropbear/files/dropbear.init | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 5c3345d..c4d6c78 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -41,7 +41,8 @@ validate_section_dropbear() 'Port:list(port):22' \ 'SSHKeepAlive:uinteger:300' \ 'IdleTimeout:uinteger:0' \ - 'mdns:uinteger:1' + 'mdns:uinteger:1' \ + 'IPPort:string' } dropbear_instance() @@ -75,7 +76,11 @@ dropbear_instance() [ "${RootLogin}" -eq 0 ] && procd_append_param command -w [ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}" [ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}" - append_ports "${ipaddrs}" "${Port}" + if [ -n "${IPPort}" ]; then + procd_append_param command -p "${IPPort}" + else + append_ports "${ipaddrs}" "${Port}" + fi [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}" [ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}" [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear" -- 2.1.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] dropbear: Fix append_port in IPv6 case
dropbear uses -p [ip6%phy]:port syntax, now correctly handled by append_port. Signed-off-by: Laurent GUERBY--- package/network/services/dropbear/files/dropbear.init | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 5c3345d..d04df44 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -16,13 +16,21 @@ append_ports() { local ipaddrs="$1" local port="$2" + local iface="$3" + local phy [ -z "$ipaddrs" ] && { procd_append_param command -p "$port" return } + network_get_physdev phy "$iface" + for addr in $ipaddrs; do + case "$addr" in + *:*) dropbear_addr="[$addr%$phy]";; + *) dropbear_addr="$addr";; + esac procd_append_param command -p "$addr:$port" done } @@ -75,7 +83,7 @@ dropbear_instance() [ "${RootLogin}" -eq 0 ] && procd_append_param command -w [ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}" [ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}" - append_ports "${ipaddrs}" "${Port}" + append_ports "${ipaddrs}" "${Port}" "${Interface}" [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}" [ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}" [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear" -- 2.1.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [PATCH] dropbear: Add IPPort parameter
The new IPPort parameter allows to pass unchanged parameters to dropbear, dropbear uses -p [ip6]:port for IPv6 and this was not supported with existing scripts. Signed-off-by: Laurent GUERBY--- package/network/services/dropbear/files/dropbear.init | 9 +++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/package/network/services/dropbear/files/dropbear.init b/package/network/services/dropbear/files/dropbear.init index 5c3345d..867efd8 100755 --- a/package/network/services/dropbear/files/dropbear.init +++ b/package/network/services/dropbear/files/dropbear.init @@ -41,7 +41,8 @@ validate_section_dropbear() 'Port:list(port):22' \ 'SSHKeepAlive:uinteger:300' \ 'IdleTimeout:uinteger:0' \ - 'mdns:uinteger:1' + 'mdns:uinteger:1' \ + 'IPPort:string' } dropbear_instance() @@ -75,7 +76,11 @@ dropbear_instance() [ "${RootLogin}" -eq 0 ] && procd_append_param command -w [ -n "${rsakeyfile}" ] && procd_append_param command -r "${rsakeyfile}" [ -n "${BannerFile}" ] && procd_append_param command -b "${BannerFile}" - append_ports "${ipaddrs}" "${Port}" + if [ -n "${IPPort}" ]; + procd_append_param command -p "${IPPort}" +else + append_ports "${ipaddrs}" "${Port}" +fi [ "${IdleTimeout}" -ne 0 ] && procd_append_param command -I "${IdleTimeout}" [ "${SSHKeepAlive}" -ne 0 ] && procd_append_param command -K "${SSHKeepAlive}" [ "${mdns}" -ne 0 ] && procd_add_mdns "ssh" "tcp" "$Port" "daemon=dropbear" -- 2.1.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] Target Profile removed from image name?
Hi Baptiste, Thanks for responding. See inline comments. On Sat, Jul 9, 2016 at 4:12 AM, Baptiste Jonglezwrote: > Hi, > > On Fri, Jul 08, 2016 at 11:11:25AM -0600, Donald Chisholm wrote: >> Hi all, >> >> I have several hundred nodes running Openwrt CC with batman-adv and >> thought I would start testing LEDE. However, after the build I >> noticed you have removed the target profile (i.e. tl-841v11) from the >> image file name. For me this is a huge headache. I also noticed you >> have uncoupled the build option for different hardware versions of >> device models. This is an inconvenience but not a huge problem. > > I'm not sure what you mean? The images still have the profile name in > them, for instance look at the images for tl-841v11 here: > > https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/ Sorry. I was being an idiot. The reason the appropriate images where not there is simply because they were not created. The image resulting from my configuration is too big :( I had no problem with Chaos Calmer but I will need to do a little work finding options I do not need in LEDE. Sorry for wasting your time. >> I build and distribute firmware updates for multiple device models. >> With Openwrt I build for several different models (and versions) and >> use a script that distributes the new firmware based on the firmware >> file name matches against a table of appropriate nodes. Of course >> this is not possible if the firmware file names are all the same. As >> it is now, I need to build and rename for each device model and >> version. > > Note that it you want to build multiple profiles at the same time, you can > now do that directly in menuconfig. This would be helpful. I tried simply selecting another profile but it deseleted the previous profile. How do I do this in menuconfig (i.e. build for all tl-wr841 versions and tl-wdr3600 v1)? Thanks for your time. >> Can you clarify why this information was removed from the image file >> name? Is it reasonable to put it back or include it in the directory >> structure so consecutive builds do not clobber previous images in the >> bin directory? >> >> Thanks for reading, >> Donald >> >> ___ >> Lede-dev mailing list >> Lede-dev@lists.infradead.org >> http://lists.infradead.org/mailman/listinfo/lede-dev ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC v4 0/4] ar71xx: image: fix making seama images
On 9 July 2016 at 21:46, Steven Haighwrote: > Tested-by: Steven Haigh > > Confirmed correct operation of these patches to make working factory > images for the MyNET N750. > > Tests all passed - happy to report all working well. > Thanks for the patience and feedback, detailed logs and testing work! Good day, yousong > On 9/07/2016 10:15 PM, Yousong Zhou wrote: >> v4 <- v3 >> >> - patch padjffs2 to allow outputing padding data to stdout >> - introduce seama-pad-rootfs to replace pad-rootfs used in v3 >> >> v3 <- v2 >> >> - pad-rootfs after seama-factory and seama-sysupgrade >> - remove the head/tail 4-bytes hack on jffs2 eof marker >> - remove the current not-needed 09-fix-seama-header >> >> v2 <- v1 >> >> - Changed "DEVICE_VARS :=" to "DEVICE_VARS +=" >> >> Yousong Zhou (3): >> ar71xx: image: seama: fix making factory and sysupgrade image >> ar71xx: image: fix typo in MTDPARTS def for qihoo-c301 >> ar71xx: base-files: remove the now unneeded 09_fix-seama-header >> >> .../base-files/etc/uci-defaults/09_fix-seama-header | 21 >> - >> target/linux/ar71xx/image/generic.mk| 21 >> + >> 2 files changed, 9 insertions(+), 33 deletions(-) >> delete mode 100644 >> target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header >> > > -- > Steven Haigh > > Email: net...@crc.id.au > Web: https://www.crc.id.au > Phone: (03) 9001 6090 - 0412 935 897 > ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC v4 0/4] ar71xx: image: fix making seama images
Tested-by: Steven HaighConfirmed correct operation of these patches to make working factory images for the MyNET N750. Tests all passed - happy to report all working well. On 9/07/2016 10:15 PM, Yousong Zhou wrote: > v4 <- v3 > > - patch padjffs2 to allow outputing padding data to stdout > - introduce seama-pad-rootfs to replace pad-rootfs used in v3 > > v3 <- v2 > > - pad-rootfs after seama-factory and seama-sysupgrade > - remove the head/tail 4-bytes hack on jffs2 eof marker > - remove the current not-needed 09-fix-seama-header > > v2 <- v1 > > - Changed "DEVICE_VARS :=" to "DEVICE_VARS +=" > > Yousong Zhou (3): > ar71xx: image: seama: fix making factory and sysupgrade image > ar71xx: image: fix typo in MTDPARTS def for qihoo-c301 > ar71xx: base-files: remove the now unneeded 09_fix-seama-header > > .../base-files/etc/uci-defaults/09_fix-seama-header | 21 > - > target/linux/ar71xx/image/generic.mk| 21 > + > 2 files changed, 9 insertions(+), 33 deletions(-) > delete mode 100644 > target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header > -- Steven Haigh Email: net...@crc.id.au Web: https://www.crc.id.au Phone: (03) 9001 6090 - 0412 935 897 signature.asc Description: OpenPGP digital signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [RFC v4 4/4] ar71xx: base-files: remove the now unneeded 09_fix-seama-header
It was intended as a workaround when jffs2 eof mark was included in the checksum calculation in seama header. When qihoo-c301 support was introduced the board name was not inserted into the case list (because I was not aware of it's existence), but the issue was fixed by excluding the jffs2 marker as part of the checksum data Now we are at it, drop it. Signed-off-by: Yousong Zhou--- .../base-files/etc/uci-defaults/09_fix-seama-header | 21 - 1 file changed, 21 deletions(-) delete mode 100644 target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header diff --git a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header b/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header deleted file mode 100644 index 000b773..000 --- a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh -# -# Copyright (C) 2013 OpenWrt.org -# - -. /lib/ar71xx.sh - -fix_seama_header() { - local part=$1 - - mtd fixseama $part -} - -board=$(ar71xx_board_name) - -case "$board" in -mynet-n600 | \ -mynet-n750) - fix_seama_header kernel - ;; -esac -- 2.6.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [RFC v4 0/4] ar71xx: image: fix making seama images
v4 <- v3 - patch padjffs2 to allow outputing padding data to stdout - introduce seama-pad-rootfs to replace pad-rootfs used in v3 v3 <- v2 - pad-rootfs after seama-factory and seama-sysupgrade - remove the head/tail 4-bytes hack on jffs2 eof marker - remove the current not-needed 09-fix-seama-header v2 <- v1 - Changed "DEVICE_VARS :=" to "DEVICE_VARS +=" Yousong Zhou (3): ar71xx: image: seama: fix making factory and sysupgrade image ar71xx: image: fix typo in MTDPARTS def for qihoo-c301 ar71xx: base-files: remove the now unneeded 09_fix-seama-header .../base-files/etc/uci-defaults/09_fix-seama-header | 21 - target/linux/ar71xx/image/generic.mk| 21 + 2 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header -- 2.6.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [RFC v4 3/4] ar71xx: image: fix typo in MTDPARTS def for qihoo-c301
Reported-by: Syrone WongSigned-off-by: Yousong Zhou --- target/linux/ar71xx/image/generic.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 1e61686..96b5a58 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -509,7 +509,7 @@ $(Device/seama) DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k BOARDNAME = QIHOO-C301 IMAGE_SIZE = 15744k - MTDPARTS = mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) + MTDPARTS = spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) SEAMA_SIGNATURE := wrgac26_qihoo360_360rg endef -- 2.6.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC v3 0/3] ar71xx: image: fix making seama images
Just to bring everyone into the loop on this. Built with this patchset - however on flashing the factory image via the emergency bootloader recovery, it has lots of problems with the JFFS2 creation. I've already sent the logs to Yousong, however pasted them here for reference as well: https://paste.fedoraproject.org/389208/06144114/ On 9/07/2016 7:33 PM, Yousong Zhou wrote: > v3 <- v2 > > - pad-jffs2 after seama-factory and seama-sysupgrade > - remove the head/tail 4-bytes hack on jffs2 eof marker > - remove the current not-needed 09-fix-seama-header > > v2 <- v1 > > - Changed "DEVICE_VARS :=" to "DEVICE_VARS +=" > > Yousong Zhou (3): > ar71xx: image: seama: fix making factory and sysupgrade image > ar71xx: image: fix typo in MTDPARTS def for qihoo-c301 > ar71xx: base-files: remove the now unneeded 09_fix-seama-header > > .../base-files/etc/uci-defaults/09_fix-seama-header | 21 > - > target/linux/ar71xx/image/generic.mk| 21 > + > 2 files changed, 9 insertions(+), 33 deletions(-) > delete mode 100644 > target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header > -- Steven Haigh Email: net...@crc.id.au Web: https://www.crc.id.au Phone: (03) 9001 6090 - 0412 935 897 signature.asc Description: OpenPGP digital signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC v3 3/3] ar71xx: base-files: remove the now unneeded 09_fix-seama-header
Still seems to give me JFFS2 errors. Log attached again. On 9/07/2016 7:33 PM, Yousong Zhou wrote: > It was intended as a workaround when jffs2 eof mark was included in the > checksum calculation in seama header. When qihoo-c301 support was > introduced the board name was not inserted into the case list (because I > was not aware of it's existence), but the issue was fixed by excluding > the jffs2 marker as part of the checksum data > > Now we are at it, drop it. > > Signed-off-by: Yousong Zhou> --- > .../base-files/etc/uci-defaults/09_fix-seama-header | 21 > - > 1 file changed, 21 deletions(-) > delete mode 100644 > target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header > > diff --git > a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header > b/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header > deleted file mode 100644 > index 000b773..000 > --- a/target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header > +++ /dev/null > @@ -1,21 +0,0 @@ > -#!/bin/sh > -# > -# Copyright (C) 2013 OpenWrt.org > -# > - > -. /lib/ar71xx.sh > - > -fix_seama_header() { > - local part=$1 > - > - mtd fixseama $part > -} > - > -board=$(ar71xx_board_name) > - > -case "$board" in > -mynet-n600 | \ > -mynet-n750) > - fix_seama_header kernel > - ;; > -esac > -- Steven Haigh Email: net...@crc.id.au Web: https://www.crc.id.au Phone: (03) 9001 6090 - 0412 935 897 U-Boot 1.1.4 (Mar 26 2012 - 21:53:42) SVN revision: 51 Target board: WRG-ND13 DRAM: sri Wasp 1.2 wasp_ddr_initial_config(255): (32bit) ddr2 init 128 MB Top of RAM usable for U-Boot at: 8800 Reserving 242k for U-Boot at: 87fc Reserving 192k for malloc() at: 87f9 Reserving 44 Bytes for Board Info at: 87f8ffd4 Reserving 36 Bytes for Global Data at: 87f8ffb0 Reserving 128k for boot params() at: 87f6ffb0 Stack Pointer at: 87f6ff98 Now running in RAM - U-Boot at: 87fc id read 0x10ff flash size 16 MB, sector count = 256 Flash: 16 MB pci_init_board: PCIe PLL not set for 40MHz refclk In:serial Out: serial Err: serial Net: ag934x_enet_initialize... wasp reset mask:c03300 WASP > S17 PHY * : cfg1 0x7 cfg2 0x7114 eth0: 00:90:a9:ad:67:21 athrs17_reg_init: complete eth0 up GIGA: athrs17_link_down all port... eth0 Hit any key to stop autoboot: 0 GIGA: athrs17_link_up lan port... ar7240> ar7240> setenv ipaddr 10.1.1.253 ar7240> httpsvr GIGA: athrs17_link_up lan port... Emergency web server start..IP is 10.1.1.253 Trying eth0 dup 1 speed AUTO(10/100/1000) Press 'q' to quit. Post up.htm verify_seama: data=0x8100, size=3407876 SEAMA == magic : 5ea3a417 meta size : 24 bytes meta data : signature=wrgnd13_wd_av image size : 0 bytes SEAMA == magic : 5ea3a417 meta size : 36 bytes meta data : dev=/dev/mtdblock/1 meta data : type=firmware meta data : meta data : image size : 3396166 bytes checksum : F007D850949314C94CE872846EA84973 digest : F007D850949314C94CE872846EA84973 Selected !!! (ENV) begin addr=0x9f07,end=0x9ffe Erase Flash from 0x9f07 to 0x9ffe in Bank # 1 First 0x7 last 0xfe sector size 0x1 254 Erased 248 sectors write addr: 9f07 Write runtime image into flash...OK,dest addr=0x9f07 Upload file OK! U-Boot 1.1.4 (Mar 26 2012 - 21:53:42) SVN revision: 51 Target board: WRG-ND13 DRAM: sri Wasp 1.2 wasp_ddr_initial_config(255): (32bit) ddr2 init 128 MB Top of RAM usable for U-Boot at: 8800 Reserving 242k for U-Boot at: 87fc Reserving 192k for malloc() at: 87f9 Reserving 44 Bytes for Board Info at: 87f8ffd4 Reserving 36 Bytes for Global Data at: 87f8ffb0 Reserving 128k for boot params() at: 87f6ffb0 Stack Pointer at: 87f6ff98 Now running in RAM - U-Boot at: 87fc id read 0x10ff flash size 16 MB, sector count = 256 Flash: 16 MB pci_init_board: PCIe PLL not set for 40MHz refclk In:serial Out: serial Err: serial Net: ag934x_enet_initialize... wasp reset mask:c03300 WASP > S17 PHY * : cfg1 0x7 cfg2 0x7114 eth0: 00:90:a9:ad:67:21 athrs17_reg_init: complete eth0 up GIGA: athrs17_link_down all port... eth0 Hit any key to stop autoboot: 0 ## Booting image at 9f07 ... Verifying Checksum ... Uncompressing SEAMA linux.lzma ... OK do_boot_linux entry = 80002000 ## Transferring control to Linux (at address ) ... ## Giving linux memsize in bytes, 134217728 Starting kernel ... OpenWrt kernel loader for AR7XXX/AR9XXX Copyright (C) 2011 Gabor Juhos Decompressing kernel... done! Starting kernel at 8006...
Re: [LEDE-DEV] Target Profile removed from image name?
Hi, On Fri, Jul 08, 2016 at 11:11:25AM -0600, Donald Chisholm wrote: > Hi all, > > I have several hundred nodes running Openwrt CC with batman-adv and > thought I would start testing LEDE. However, after the build I > noticed you have removed the target profile (i.e. tl-841v11) from the > image file name. For me this is a huge headache. I also noticed you > have uncoupled the build option for different hardware versions of > device models. This is an inconvenience but not a huge problem. I'm not sure what you mean? The images still have the profile name in them, for instance look at the images for tl-841v11 here: https://downloads.lede-project.org/snapshots/targets/ar71xx/generic/ > I build and distribute firmware updates for multiple device models. > With Openwrt I build for several different models (and versions) and > use a script that distributes the new firmware based on the firmware > file name matches against a table of appropriate nodes. Of course > this is not possible if the firmware file names are all the same. As > it is now, I need to build and rename for each device model and > version. Note that it you want to build multiple profiles at the same time, you can now do that directly in menuconfig. > Can you clarify why this information was removed from the image file > name? Is it reasonable to put it back or include it in the directory > structure so consecutive builds do not clobber previous images in the > bin directory? > > Thanks for reading, > Donald > > ___ > Lede-dev mailing list > Lede-dev@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/lede-dev signature.asc Description: PGP signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [RFC v3 0/3] ar71xx: image: fix making seama images
v3 <- v2 - pad-jffs2 after seama-factory and seama-sysupgrade - remove the head/tail 4-bytes hack on jffs2 eof marker - remove the current not-needed 09-fix-seama-header v2 <- v1 - Changed "DEVICE_VARS :=" to "DEVICE_VARS +=" Yousong Zhou (3): ar71xx: image: seama: fix making factory and sysupgrade image ar71xx: image: fix typo in MTDPARTS def for qihoo-c301 ar71xx: base-files: remove the now unneeded 09_fix-seama-header .../base-files/etc/uci-defaults/09_fix-seama-header | 21 - target/linux/ar71xx/image/generic.mk| 21 + 2 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 target/linux/ar71xx/base-files/etc/uci-defaults/09_fix-seama-header -- 2.6.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] [RFC v3 1/3] ar71xx: image: seama: fix making factory and sysupgrade image
Signed-off-by: Yousong Zhou--- target/linux/ar71xx/image/generic.mk | 19 --- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index b8e70a4..c1f1cae 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -437,22 +437,17 @@ TARGET_DEVICES += hiwifi-hc6361 # The pre-filled 64 bytes consist of # - 28 bytes seama_header # - 36 bytes of META data (4-bytes aligned) -# -# And as the 4 bytes jffs2 marker will be erased on first boot, they need to -# be excluded from the calculation of checksum define Build/seama-factory ( dd if=/dev/zero bs=64 count=1; cat $(word 1,$^) ) >$@.loader.tmp ( dd if=$@.loader.tmp bs=64k conv=sync; dd if=$(word 2,$^) ) >$@.tmp.0 tail -c +65 $@.tmp.0 >$@.tmp.1 - head -c -4 $@.tmp.1 >$@.tmp.2 $(STAGING_DIR_HOST)/bin/seama \ - -i $@.tmp.2 \ + -i $@.tmp.1 \ -m "dev=/dev/mtdblock/1" -m "type=firmware" $(STAGING_DIR_HOST)/bin/seama \ -s $@ \ -m "signature=$(1)" \ - -i $@.tmp.2.seama - tail -c 4 $@.tmp.1 >>$@ + -i $@.tmp.1.seama rm -f $@.loader.tmp $@.tmp.* endef @@ -461,6 +456,7 @@ define Build/seama-sysupgrade -i $(word 1,$^) \ -m "dev=/dev/mtdblock/1" -m "type=firmware" ( dd if=$(word 1,$^).seama bs=64k conv=sync; dd if=$(word 2,$^) ) >$@ + rm -f $(word 1,$^).seama endef define Build/seama-initramfs @@ -472,14 +468,15 @@ endef define Device/seama CONSOLE := ttyS0,115200 - KERNEL := kernel-bin | loader-kernel-cmdline | lzma + LOADER_TYPE := bin + KERNEL := kernel-bin | lzma | loader-kernel-cmdline | lzma KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | seama-initramfs KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX).seama IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin := seama-sysupgrade (SEAMA_SIGNATURE) | check-size (IMAGE_SIZE) - IMAGE/factory.bin := seama-factory (SEAMA_SIGNATURE) | check-size (IMAGE_SIZE) + IMAGE/sysupgrade.bin := seama-sysupgrade (SEAMA_SIGNATURE) | pad-rootfs | check-size (IMAGE_SIZE) + IMAGE/factory.bin := seama-factory (SEAMA_SIGNATURE) | pad-rootfs | check-size (IMAGE_SIZE) SEAMA_SIGNATURE := - DEVICE_VARS := SEAMA_SIGNATURE + DEVICE_VARS += SEAMA_SIGNATURE endef define Device/mynet-n600 -- 2.6.4 ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
[LEDE-DEV] DHCP via bridge in case of IPv4
Hello, I was playing with quite simple bridged setup on different boards with very recent kernels (4.6.3 as of this writing) and found one interesting behavior that I cannot yet understand and googling din't help here as well. My setup is pretty simple: - -- - | HOST | | "Dumb AP" | | Wireless client | | with DHCP |<->(eth0) (wlan0)<->| attempting to | | server| |\ br0 / | | get settings via DHCP | - -- - * HOST is my laptop with DHCP server that works for sure. * "Dumb AP" is a separate board (I tried ARM-based Wandboard and ARC-based AXS10x boards but results are exactly the same) with wired (eth0) and wireless (wlan0) network controllers bridged together (br0). That "br0" bridge flawlessly gets its settings from DHCP server on host. * Wireless client could be either a smatrphone or another laptop etc but what's important it should be configured to get network settings by DHCP as well. So what happens "br0" always gets network settings from DHCP server on HOST. That's fine. But wireless client only reliably gets settings from DHCP server if IPv6 is enabled on "Dumb AP" board. If IPv6 is disabled I may see that wireless client sends "DHCP Discover" then server replies with "DHCP Offer" but that offer never reaches wireless client. Well actually sometimes very-very rarely that offer may reach wireless client but I cannot understand how to reproduce it reliably. Still looks like enabling of IPv6 fixes that issue. So my question here is: why I see that difference with IPv4 vs IPv6? One sidenote: Somehow I figured out that in case of IPv4 so-called routing cache is absent (it was removed in Linux kernel 3.6) while with IPv6 it still exist. And assuming my hardware is sane and no data gets lost I may think that it's really a routing problem and missing routing cache might be an answer. Still being a noob in networking stuff I'd like to get a bit better explanation of things I see. All thoughts and comments are more than welcome. Regards, Alexey ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC v2 1/2] ar71xx: image: fix making loader kernel for seama
Sorry - I thought that would be a separate patch. If its a modification of either of these two, I'll hold off until I've tested v3 of your changes. On 9/07/2016 6:09 PM, Yousong Zhou wrote: > On 9 July 2016 at 15:56, Steven Haighwrote: >> Tested-by: Steven Haigh >> > > Thanks, Steven > > I am working on the jffs2 magic missing issue. Guess a RFCv3 will > follow shortly. > > Cheers, > yousong > >> On 9/07/2016 11:06 AM, Yousong Zhou wrote: >>> Signed-off-by: Yousong Zhou >>> --- >>> v2 <- v1 >>> >>> - Changed "DEVICE_VARS :=" to "DEVICE_VARS +=" >>> >>> target/linux/ar71xx/image/generic.mk | 6 -- >>> 1 file changed, 4 insertions(+), 2 deletions(-) >>> >>> diff --git a/target/linux/ar71xx/image/generic.mk >>> b/target/linux/ar71xx/image/generic.mk >>> index b8e70a4..a341a78 100644 >>> --- a/target/linux/ar71xx/image/generic.mk >>> +++ b/target/linux/ar71xx/image/generic.mk >>> @@ -461,6 +461,7 @@ define Build/seama-sysupgrade >>> -i $(word 1,$^) \ >>> -m "dev=/dev/mtdblock/1" -m "type=firmware" >>> ( dd if=$(word 1,$^).seama bs=64k conv=sync; dd if=$(word 2,$^) ) >$@ >>> + rm -f $(word 1,$^).seama >>> endef >>> >>> define Build/seama-initramfs >>> @@ -472,14 +473,15 @@ endef >>> >>> define Device/seama >>>CONSOLE := ttyS0,115200 >>> - KERNEL := kernel-bin | loader-kernel-cmdline | lzma >>> + LOADER_TYPE := bin >>> + KERNEL := kernel-bin | lzma | loader-kernel-cmdline | lzma >>>KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | seama-initramfs >>>KERNEL_INITRAMFS_SUFFIX = $$(KERNEL_SUFFIX).seama >>>IMAGES := sysupgrade.bin factory.bin >>>IMAGE/sysupgrade.bin := seama-sysupgrade (SEAMA_SIGNATURE) | >>> check-size (IMAGE_SIZE) >>>IMAGE/factory.bin := seama-factory (SEAMA_SIGNATURE) | check-size >>> (IMAGE_SIZE) >>>SEAMA_SIGNATURE := >>> - DEVICE_VARS := SEAMA_SIGNATURE >>> + DEVICE_VARS += SEAMA_SIGNATURE >>> endef >>> >>> define Device/mynet-n600 >>> >> >> -- >> Steven Haigh >> >> Email: net...@crc.id.au >> Web: https://www.crc.id.au >> Phone: (03) 9001 6090 - 0412 935 897 >> -- Steven Haigh Email: net...@crc.id.au Web: https://www.crc.id.au Phone: (03) 9001 6090 - 0412 935 897 signature.asc Description: OpenPGP digital signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev
Re: [LEDE-DEV] [RFC v2 2/2] ar71xx: image: fix typo in MTDPARTS def for qihoo-c301
Tested-by: Steven HaighOn 9/07/2016 11:06 AM, Yousong Zhou wrote: > Reported-by: Syrone Wong > Signed-off-by: Yousong Zhou > --- > target/linux/ar71xx/image/generic.mk | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/target/linux/ar71xx/image/generic.mk > b/target/linux/ar71xx/image/generic.mk > index a341a78..7978ce3 100644 > --- a/target/linux/ar71xx/image/generic.mk > +++ b/target/linux/ar71xx/image/generic.mk > @@ -510,7 +510,7 @@ $(Device/seama) >DEVICE_PACKAGES := kmod-usb-core kmod-usb2 kmod-ledtrig-usbdev kmod-ath10k >BOARDNAME = QIHOO-C301 >IMAGE_SIZE = 15744k > - MTDPARTS = > mtdparts=spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) > + MTDPARTS = > spi0.0:256k(u-boot)ro,64k(u-boot-env),64k(devdata),64k(devconf),15744k(firmware),64k(warm_start),64k(action_image_config),64k(radiocfg)ro;spi0.1:15360k(upgrade2),1024k(privatedata) >SEAMA_SIGNATURE := wrgac26_qihoo360_360rg > endef > > -- Steven Haigh Email: net...@crc.id.au Web: https://www.crc.id.au Phone: (03) 9001 6090 - 0412 935 897 signature.asc Description: OpenPGP digital signature ___ Lede-dev mailing list Lede-dev@lists.infradead.org http://lists.infradead.org/mailman/listinfo/lede-dev