Message ID | 1487360382-9116-1-git-send-email-fff@chrisi01.de |
---|---|
State | Accepted |
Commit | 9cd2738b366c9f50c084bba28a7f8321c597a47e |
Headers | show |
diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config index 895c5e8..4cedc41 100644 --- a/bsp/ar71xx/.config +++ b/bsp/ar71xx/.config @@ -32,6 +32,8 @@ CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v2=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v2="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v3=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v3="" +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v4=y +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v4="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr740n-v4=y CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr740n-v4="" CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr741nd-v2=y diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp index a6747ba..6ef9b80 100644 --- a/bsp/board_ar71xx.bsp +++ b/bsp/board_ar71xx.bsp @@ -17,6 +17,7 @@ images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin" "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" "lede-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin" + "lede-ar71xx-generic-tl-wr1043nd-v4-squashfs-sysupgrade.bin" "lede-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin" "lede-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin" "lede-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin" diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile index 115abd2..4f3b08c 100644 --- a/src/packages/fff/fff-network/Makefile +++ b/src/packages/fff/fff-network/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-network -PKG_VERSION:=0.0.4 +PKG_VERSION:=0.0.5 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 new file mode 100644 index 0000000..93772f9 --- /dev/null +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 @@ -0,0 +1,16 @@ +WANDEV=eth0 +SWITCHDEV=eth0 +CLIENT_PORTS="1 2 0t" +WAN_PORTS="5 0t" +BATMAN_PORTS="3 4 0t" + +. /lib/functions/system.sh +. /lib/functions/uci-defaults.sh +. /lib/ar71xx.sh + +# Load second MAC from Flash because we haven't any Interface with this MAC where we can copy the MAC from +# https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1 + +NEWMAC=$(mtd_get_mac_binary config 0x1017c) +ETHMESHMAC=1 +ROUTERMAC=eth0 diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork index 94beb90..d805fd5 100755 --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork @@ -108,6 +108,10 @@ if [[ -n "$ETHMESHMAC" ]]; then echo "Fixing MAC on eth0.3 (ethmesh)" sleep 10 NEW_MACADDR=$(cat /sys/class/net/$ETHMESHMAC/address) + # We need this to set the second MAC for the wr1043 v4 from a variable and not from an Interface + if [[ -n "$NEWMAC" ]]; then + NEW_MACADDR=$NEWMAC + fi uci set network.ethmesh.macaddr=$NEW_MACADDR uci commit ifconfig eth0.3 down
sollte dann so passen Reviewed-by: Jan Kraus <mayosemmel@gmail.com> Am Freitag, den 17.02.2017, 20:39 +0100 schrieb Christian Dresel: > Dieses Patch fügt den Support für den WR1043 v4 hinzu. Dieses Patch > baut auf den LEDE Patch auf und darf erst nach dem LEDE Patch > applied werden. > > Signed-off-by: Christian Dresel <fff@chrisi01.de> > --- > bsp/ar71xx/.config | 2 ++ > bsp/board_ar71xx.bsp | 1 + > src/packages/fff/fff-network/Makefile | 2 +- > .../fff/fff-network/ar71xx/network.tl-wr1043nd-v4 | 16 ++++++++++++++++ > .../fff/fff-network/files/usr/sbin/configurenetwork | 4 ++++ > 5 files changed, 24 insertions(+), 1 deletion(-) > create mode 100644 src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 > > diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config > index 895c5e8..4cedc41 100644 > --- a/bsp/ar71xx/.config > +++ b/bsp/ar71xx/.config > @@ -32,6 +32,8 @@ CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v2=y > CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v2="" > CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v3=y > CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v3="" > +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v4=y > +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v4="" > CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr740n-v4=y > CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr740n-v4="" > CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr741nd-v2=y > diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp > index a6747ba..6ef9b80 100644 > --- a/bsp/board_ar71xx.bsp > +++ b/bsp/board_ar71xx.bsp > @@ -17,6 +17,7 @@ images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin" > + "lede-ar71xx-generic-tl-wr1043nd-v4-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin" > diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile > index 115abd2..4f3b08c 100644 > --- a/src/packages/fff/fff-network/Makefile > +++ b/src/packages/fff/fff-network/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-network > -PKG_VERSION:=0.0.4 > +PKG_VERSION:=0.0.5 > PKG_RELEASE:=1 > > PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network > diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 > new file mode 100644 > index 0000000..93772f9 > --- /dev/null > +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 > @@ -0,0 +1,16 @@ > +WANDEV=eth0 > +SWITCHDEV=eth0 > +CLIENT_PORTS="1 2 0t" > +WAN_PORTS="5 0t" > +BATMAN_PORTS="3 4 0t" > + > +. /lib/functions/system.sh > +. /lib/functions/uci-defaults.sh > +. /lib/ar71xx.sh > + > +# Load second MAC from Flash because we haven't any Interface with this MAC where we can copy the MAC from > +# https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1 > + > +NEWMAC=$(mtd_get_mac_binary config 0x1017c) > +ETHMESHMAC=1 > +ROUTERMAC=eth0 > diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork > index 94beb90..d805fd5 100755 > --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork > +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork > @@ -108,6 +108,10 @@ if [[ -n "$ETHMESHMAC" ]]; then > echo "Fixing MAC on eth0.3 (ethmesh)" > sleep 10 > NEW_MACADDR=$(cat /sys/class/net/$ETHMESHMAC/address) > + # We need this to set the second MAC for the wr1043 v4 from a variable and not from an Interface > + if [[ -n "$NEWMAC" ]]; then > + NEW_MACADDR=$NEWMAC > + fi > uci set network.ethmesh.macaddr=$NEW_MACADDR > uci commit > ifconfig eth0.3 down > -- > 2.1.4 >
Hi Am 17. Februar 2017 20:54:56 MEZ schrieb Jan Kraus <mayosemmel@googlemail.com>: >sollte dann so passen >Reviewed-by: Jan Kraus <mayosemmel@gmail.com> Ich war auch hin und her gerissen.. Mit den Kommentaren ist es denke ich ein guter Kompromiss. Reviewed-by: Tim Niemeyer <tim@tn-x.org> Vielleicht müssen wir uns langfristig aber mal was anderes einfallen lassen wegen der network config. Tin >Am Freitag, den 17.02.2017, 20:39 +0100 schrieb Christian Dresel: >> Dieses Patch fügt den Support für den WR1043 v4 hinzu. Dieses Patch >> baut auf den LEDE Patch auf und darf erst nach dem LEDE Patch >> applied werden. >> >> Signed-off-by: Christian Dresel <fff@chrisi01.de> >> --- >> bsp/ar71xx/.config | 2 ++ >> bsp/board_ar71xx.bsp | 1 + >> src/packages/fff/fff-network/Makefile | 2 +- >> .../fff/fff-network/ar71xx/network.tl-wr1043nd-v4 | 16 >++++++++++++++++ >> .../fff/fff-network/files/usr/sbin/configurenetwork | 4 ++++ >> 5 files changed, 24 insertions(+), 1 deletion(-) >> create mode 100644 >src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 >> >> diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config >> index 895c5e8..4cedc41 100644 >> --- a/bsp/ar71xx/.config >> +++ b/bsp/ar71xx/.config >> @@ -32,6 +32,8 @@ >CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v2=y >> >CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v2="" >> CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v3=y >> >CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v3="" >> +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v4=y >> >+CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v4="" >> CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr740n-v4=y >> CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr740n-v4="" >> CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr741nd-v2=y >> diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp >> index a6747ba..6ef9b80 100644 >> --- a/bsp/board_ar71xx.bsp >> +++ b/bsp/board_ar71xx.bsp >> @@ -17,6 +17,7 @@ >images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin" >> "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" >> "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" >> "lede-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin" >> + "lede-ar71xx-generic-tl-wr1043nd-v4-squashfs-sysupgrade.bin" >> "lede-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin" >> "lede-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin" >> "lede-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin" >> diff --git a/src/packages/fff/fff-network/Makefile >b/src/packages/fff/fff-network/Makefile >> index 115abd2..4f3b08c 100644 >> --- a/src/packages/fff/fff-network/Makefile >> +++ b/src/packages/fff/fff-network/Makefile >> @@ -1,7 +1,7 @@ >> include $(TOPDIR)/rules.mk >> >> PKG_NAME:=fff-network >> -PKG_VERSION:=0.0.4 >> +PKG_VERSION:=0.0.5 >> PKG_RELEASE:=1 >> >> PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network >> diff --git >a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 >b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 >> new file mode 100644 >> index 0000000..93772f9 >> --- /dev/null >> +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 >> @@ -0,0 +1,16 @@ >> +WANDEV=eth0 >> +SWITCHDEV=eth0 >> +CLIENT_PORTS="1 2 0t" >> +WAN_PORTS="5 0t" >> +BATMAN_PORTS="3 4 0t" >> + >> +. /lib/functions/system.sh >> +. /lib/functions/uci-defaults.sh >> +. /lib/ar71xx.sh >> + >> +# Load second MAC from Flash because we haven't any Interface with >this MAC where we can copy the MAC from >> +# >https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1 >> + >> +NEWMAC=$(mtd_get_mac_binary config 0x1017c) >> +ETHMESHMAC=1 >> +ROUTERMAC=eth0 >> diff --git >a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork >b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork >> index 94beb90..d805fd5 100755 >> --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork >> +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork >> @@ -108,6 +108,10 @@ if [[ -n "$ETHMESHMAC" ]]; then >> echo "Fixing MAC on eth0.3 (ethmesh)" >> sleep 10 >> NEW_MACADDR=$(cat /sys/class/net/$ETHMESHMAC/address) >> + # We need this to set the second MAC for the wr1043 v4 from >a variable and not from an Interface >> + if [[ -n "$NEWMAC" ]]; then >> + NEW_MACADDR=$NEWMAC >> + fi >> uci set network.ethmesh.macaddr=$NEW_MACADDR >> uci commit >> ifconfig eth0.3 down >> -- >> 2.1.4 >>
Hi Applied. Danke für den Patch. Tim Am Freitag, den 17.02.2017, 20:39 +0100 schrieb Christian Dresel: > Dieses Patch fügt den Support für den WR1043 v4 hinzu. Dieses Patch > baut auf den LEDE Patch auf und darf erst nach dem LEDE Patch > applied werden. > > Signed-off-by: Christian Dresel <fff@chrisi01.de> > --- > bsp/ar71xx/.config | 2 ++ > bsp/board_ar71xx.bsp | 1 + > src/packages/fff/fff-network/Makefile | 2 +- > .../fff/fff-network/ar71xx/network.tl-wr1043nd-v4 | 16 ++++++++++++++++ > .../fff/fff-network/files/usr/sbin/configurenetwork | 4 ++++ > 5 files changed, 24 insertions(+), 1 deletion(-) > create mode 100644 src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 > > diff --git a/bsp/ar71xx/.config b/bsp/ar71xx/.config > index 895c5e8..4cedc41 100644 > --- a/bsp/ar71xx/.config > +++ b/bsp/ar71xx/.config > @@ -32,6 +32,8 @@ CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v2=y > CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v2="" > CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v3=y > CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v3="" > +CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr1043nd-v4=y > +CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr1043nd-v4="" > CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr740n-v4=y > CONFIG_TARGET_DEVICE_PACKAGES_ar71xx_generic_DEVICE_tl-wr740n-v4="" > CONFIG_TARGET_DEVICE_ar71xx_generic_DEVICE_tl-wr741nd-v2=y > diff --git a/bsp/board_ar71xx.bsp b/bsp/board_ar71xx.bsp > index a6747ba..6ef9b80 100644 > --- a/bsp/board_ar71xx.bsp > +++ b/bsp/board_ar71xx.bsp > @@ -17,6 +17,7 @@ images=("lede-ar71xx-generic-cpe210-220-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wr1043nd-v1-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wr1043nd-v2-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wr1043nd-v3-squashfs-sysupgrade.bin" > + "lede-ar71xx-generic-tl-wr1043nd-v4-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wa860re-v1-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-tl-wa850re-v1-squashfs-sysupgrade.bin" > "lede-ar71xx-generic-gl-ar150-squashfs-sysupgrade.bin" > diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile > index 115abd2..4f3b08c 100644 > --- a/src/packages/fff/fff-network/Makefile > +++ b/src/packages/fff/fff-network/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-network > -PKG_VERSION:=0.0.4 > +PKG_VERSION:=0.0.5 > PKG_RELEASE:=1 > > PKG_BUILD_DIR:=$(BUILD_DIR)/fff-network > diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 > new file mode 100644 > index 0000000..93772f9 > --- /dev/null > +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4 > @@ -0,0 +1,16 @@ > +WANDEV=eth0 > +SWITCHDEV=eth0 > +CLIENT_PORTS="1 2 0t" > +WAN_PORTS="5 0t" > +BATMAN_PORTS="3 4 0t" > + > +. /lib/functions/system.sh > +. /lib/functions/uci-defaults.sh > +. /lib/ar71xx.sh > + > +# Load second MAC from Flash because we haven't any Interface with this MAC where we can copy the MAC from > +# https://github.com/lede-project/source/pull/613/files#diff-abd6f42f54204372151e73eac0556db1 > + > +NEWMAC=$(mtd_get_mac_binary config 0x1017c) > +ETHMESHMAC=1 > +ROUTERMAC=eth0 > diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork > index 94beb90..d805fd5 100755 > --- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork > +++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork > @@ -108,6 +108,10 @@ if [[ -n "$ETHMESHMAC" ]]; then > echo "Fixing MAC on eth0.3 (ethmesh)" > sleep 10 > NEW_MACADDR=$(cat /sys/class/net/$ETHMESHMAC/address) > + # We need this to set the second MAC for the wr1043 v4 from a variable and not from an Interface > + if [[ -n "$NEWMAC" ]]; then > + NEW_MACADDR=$NEWMAC > + fi > uci set network.ethmesh.macaddr=$NEW_MACADDR > uci commit > ifconfig eth0.3 down > -- > 2.1.4 >
Dieses Patch fügt den Support für den WR1043 v4 hinzu. Dieses Patch baut auf den LEDE Patch auf und darf erst nach dem LEDE Patch applied werden. Signed-off-by: Christian Dresel <fff@chrisi01.de> --- bsp/ar71xx/.config | 2 ++ bsp/board_ar71xx.bsp | 1 + src/packages/fff/fff-network/Makefile | 2 +- .../fff/fff-network/ar71xx/network.tl-wr1043nd-v4 | 16 ++++++++++++++++ .../fff/fff-network/files/usr/sbin/configurenetwork | 4 ++++ 5 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 src/packages/fff/fff-network/ar71xx/network.tl-wr1043nd-v4