| Message ID | 20191226191211.5262-1-foss@volatilesystems.org |
|---|---|
| State | Rejected |
| Headers | show |
| Series | [OpenWrt-Devel,v2] ramips: rename DIR-860L entries according to the new manufacturer / device spec | expand |
Stijn Segers <foss@volatilesystems.org> schreef op 26 december 2019 20:12:11 CET: >Most images follow the openwrt-target-subtarget-manufacturer-device >naming specification, but the D-Link DIR-860L rev B1 does not. This >patch brings it in line. > >Master had this updated a while ago, it's okay there. > >Signed-off-by: Stijn Segers <foss@volatilesystems.org> >--- > target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- > target/linux/ramips/base-files/etc/board.d/02_network | 4 ++-- > .../linux/ramips/base-files/etc/uci-defaults/09_fix-checksum | 2 +- > target/linux/ramips/image/mt7621.mk | 4 ++-- > 4 files changed, 6 insertions(+), 6 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 fb74a2c87b..f08f6d7b1d 100755 >--- a/target/linux/ramips/base-files/etc/board.d/01_leds >+++ b/target/linux/ramips/base-files/etc/board.d/01_leds >@@ -160,7 +160,7 @@ dlink,dwr-922-e2) > ucidef_set_led_netdev "signalstrength" "signalstrength" >"$boardname:green:sigstrength" "wwan0" "link" > ucidef_set_led_netdev "4g" "4g" "$boardname:green:4g" "wwan0" "tx rx" > ;; >-dir-860l-b1) >+dlink,dir-860l-b1) > ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2" > ;; > ex2700|\ >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 77cc8d63f9..38d2d38c2b 100755 >--- a/target/linux/ramips/base-files/etc/board.d/02_network >+++ b/target/linux/ramips/base-files/etc/board.d/02_network >@@ -271,7 +271,7 @@ ramips_setup_interfaces() > ucidef_add_switch "switch0" \ > "1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0" > ;; >- dir-860l-b1|\ >+ dlink,dir-860l-b1|\ > elecom,wrc-1167ghbk2-s|\ > elecom,wrc-2533gst|\ > elecom,wrc-1900gst|\ >@@ -553,7 +553,7 @@ ramips_setup_macs() > dch-m225) > lan_mac=$(mtd_get_mac_ascii factory lanmac) > ;; >- dir-860l-b1) >+ dlink,dir-860l-b1) > lan_mac=$(mtd_get_mac_ascii factory lanmac) > wan_mac=$(mtd_get_mac_ascii factory wanmac) > ;; >diff --git >a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum >b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum >index 54deb5b2e0..40746c6af4 100644 >--- a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum >+++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum >@@ -17,7 +17,7 @@ case "$board" in > cy-swr1100 | \ > dch-m225 | \ > dir-645 | \ >-dir-860l-b1) >+dlink,dir-860l-b1) > fix_checksum seama > ;; > dlink,dap-1522-a1) >diff --git a/target/linux/ramips/image/mt7621.mk >b/target/linux/ramips/image/mt7621.mk >index 7eb59188fb..6507e40f86 100644 >--- a/target/linux/ramips/image/mt7621.mk >+++ b/target/linux/ramips/image/mt7621.mk >@@ -110,7 +110,7 @@ define Device/asus_rt-ac57u > endef > TARGET_DEVICES += asus_rt-ac57u > >-define Device/dir-860l-b1 >+define Device/dlink_dir-860l-b1 > $(Device/seama) > DTS := DIR-860L-B1 > BLOCKSIZE := 64k >@@ -120,7 +120,7 @@ define Device/dir-860l-b1 > DEVICE_TITLE := D-Link DIR-860L B1 >DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport >wpad-basic > endef >-TARGET_DEVICES += dir-860l-b1 >+TARGET_DEVICES += dlink_dir-860l-b1 > > define Device/mediatek_ap-mt7621a-v60 > DTS := AP-MT7621A-V60 >-- >2.20.1 > > >_______________________________________________ >openwrt-devel mailing list >openwrt-devel@lists.openwrt.org >https://lists.openwrt.org/mailman/listinfo/openwrt-devel Sorry guys... A v2 for my previous patch, still for 19.07.
Hi again, > -define Device/dir-860l-b1 > +define Device/dlink_dir-860l-b1 This would break sysupgrade, as SUPPORTED_DEVICES is derived from device definition name, and thus would change. So, this shouldn't be applied if someone really plans to do it. BTW That's a good example of why backporting this selectively is painful indeed ;-) Best Adrian > $(Device/seama) > DTS := DIR-860L-B1 > BLOCKSIZE := 64k > @@ -120,7 +120,7 @@ define Device/dir-860l-b1 > DEVICE_TITLE := D-Link DIR-860L B1 > DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport > wpad-basic endef -TARGET_DEVICES += dir-860l-b1 > +TARGET_DEVICES += dlink_dir-860l-b1 > > define Device/mediatek_ap-mt7621a-v60 > DTS := AP-MT7621A-V60 > -- > 2.20.1 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
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 fb74a2c87b..f08f6d7b1d 100755 --- a/target/linux/ramips/base-files/etc/board.d/01_leds +++ b/target/linux/ramips/base-files/etc/board.d/01_leds @@ -160,7 +160,7 @@ dlink,dwr-922-e2) ucidef_set_led_netdev "signalstrength" "signalstrength" "$boardname:green:sigstrength" "wwan0" "link" ucidef_set_led_netdev "4g" "4g" "$boardname:green:4g" "wwan0" "tx rx" ;; -dir-860l-b1) +dlink,dir-860l-b1) ucidef_set_led_netdev "wan" "wan" "$boardname:green:net" "eth0.2" ;; ex2700|\ 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 77cc8d63f9..38d2d38c2b 100755 --- a/target/linux/ramips/base-files/etc/board.d/02_network +++ b/target/linux/ramips/base-files/etc/board.d/02_network @@ -271,7 +271,7 @@ ramips_setup_interfaces() ucidef_add_switch "switch0" \ "1:lan:3" "2:lan:4" "3:lan:1" "4:lan:2" "0:wan" "6@eth0" ;; - dir-860l-b1|\ + dlink,dir-860l-b1|\ elecom,wrc-1167ghbk2-s|\ elecom,wrc-2533gst|\ elecom,wrc-1900gst|\ @@ -553,7 +553,7 @@ ramips_setup_macs() dch-m225) lan_mac=$(mtd_get_mac_ascii factory lanmac) ;; - dir-860l-b1) + dlink,dir-860l-b1) lan_mac=$(mtd_get_mac_ascii factory lanmac) wan_mac=$(mtd_get_mac_ascii factory wanmac) ;; diff --git a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum index 54deb5b2e0..40746c6af4 100644 --- a/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum +++ b/target/linux/ramips/base-files/etc/uci-defaults/09_fix-checksum @@ -17,7 +17,7 @@ case "$board" in cy-swr1100 | \ dch-m225 | \ dir-645 | \ -dir-860l-b1) +dlink,dir-860l-b1) fix_checksum seama ;; dlink,dap-1522-a1) diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index 7eb59188fb..6507e40f86 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -110,7 +110,7 @@ define Device/asus_rt-ac57u endef TARGET_DEVICES += asus_rt-ac57u -define Device/dir-860l-b1 +define Device/dlink_dir-860l-b1 $(Device/seama) DTS := DIR-860L-B1 BLOCKSIZE := 64k @@ -120,7 +120,7 @@ define Device/dir-860l-b1 DEVICE_TITLE := D-Link DIR-860L B1 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-basic endef -TARGET_DEVICES += dir-860l-b1 +TARGET_DEVICES += dlink_dir-860l-b1 define Device/mediatek_ap-mt7621a-v60 DTS := AP-MT7621A-V60
Most images follow the openwrt-target-subtarget-manufacturer-device naming specification, but the D-Link DIR-860L rev B1 does not. This patch brings it in line. Master had this updated a while ago, it's okay there. Signed-off-by: Stijn Segers <foss@volatilesystems.org> --- target/linux/ramips/base-files/etc/board.d/01_leds | 2 +- target/linux/ramips/base-files/etc/board.d/02_network | 4 ++-- .../linux/ramips/base-files/etc/uci-defaults/09_fix-checksum | 2 +- target/linux/ramips/image/mt7621.mk | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-)