him411/gl-infra-builder-FUjr
1
0
Fork 0
mirror of https://github.com/FUjr/gl-infra-builder.git synced 2025-12-16 09:10:02 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

update s200

Browse Source
This commit is contained in:
gl-yangweiping 2022-10-14 03:41:56 -04:00
parent bfbd3a77e0
commit ce64b8127e
3 changed files with 219 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
patches-21.02.2/0031-s200-add-wan_mac-lan_mac.patch Normal file
View File

@ -0,0 +1,61 @@
From 51c9b9c91cb605c56e019d341500e8456b524661 Mon Sep 17 00:00:00 2001
From: gl-yangweiping <weiping.yang@gl-inet.com>
Date: Fri, 14 Oct 2022 03:39:01 -0400
Subject: [PATCH] s200 add wan_mac-lan_mac
---
target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi | 8 +++-----
target/linux/ath79/nand/base-files/etc/board.d/02_network | 4 ++++
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
index 49307fc2a9..0b1c8594ee 100644
--- a/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
+++ b/target/linux/ath79/dts/qca9531_glinet_gl-s200.dtsi
@@ -20,6 +20,8 @@
lan = "eth1";
reset-button = "gpio-3";
flash_size = <128>;
+ switch-button = "gpio-14";
+ radio = "radio0";
factory_data {
device_mac = "art";
device_ddns = "art", "0x10";
@@ -45,7 +47,7 @@
switch {
label = "switch";
- linux,code = <BTN_1>;
+ linux,code = <KEY_SETUP>;
linux,input-type = <EV_SW>;
gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
};
@@ -180,10 +182,6 @@
};
};
-&bootargs {
- bootargs="";
-};
-
&eth0 {
status = "okay";
mtd-mac-address = <&art 0x0>;
diff --git a/target/linux/ath79/nand/base-files/etc/board.d/02_network b/target/linux/ath79/nand/base-files/etc/board.d/02_network
index f277679f3e..30ba94d981 100755
--- a/target/linux/ath79/nand/base-files/etc/board.d/02_network
+++ b/target/linux/ath79/nand/base-files/etc/board.d/02_network
@@ -79,6 +79,10 @@ ath79_setup_macs()
netgear,wndr4500-v3)
wan_mac=$(mtd_get_mac_binary caldata 0x6)
;;
+ glinet,gl-s200-nor-nand)
+ wan_mac=$(mtd_get_mac_binary art 0)
+ lan_mac=$(macaddr_add "$wan_mac" 1)
+ ;;
esac
[ -n "$lan_mac" ] && ucidef_set_interface_macaddr "lan" $lan_mac
--
2.17.1

135
profiles/glinet_s200.yml
View File

@ -2,136 +2,5 @@
description: Add the glinet dependencies
feeds:
- name: glinet
path: ../feeds_dir/glinet
packages:
- kmod-usb2
- kmod-usb-ehci
- kmod-usb-serial
- kmod-gl-sdk4-hw-info
- kmod-gl-sdk4-tertf
- wpad-openssl
- wget-ssl
- dnsmasq-full
- mwan3
- iwinfo
- gl-oui-rpc
- ot-br-posix
- gl-silabs-dfu
- gl-sdk4-acl
- gl-sdk4-base-files
- gl-sdk4-cable
- gl-sdk4-carrier-monitor
- gl-sdk4-clients
- gl-sdk4-cloud
- gl-sdk4-cloud-batch-manage
- gl-sdk4-ddns
- gl-sdk4-dns
- gl-sdk4-firewall
- gl-sdk4-init-portal
- gl-sdk4-ipv6
- gl-sdk4-lan
- gl-sdk4-led
- gl-sdk4-log
- gl-sdk4-logread
- gl-sdk4-lua-utils
- gl-sdk4-luci
- gl-sdk4-macclone
- gl-sdk4-mqtt
- gl-sdk4-netmode
- gl-sdk4-network
- gl-sdk4-network-diag
- gl-sdk4-ovpn-client
- gl-sdk4-ovpn-server
- gl-sdk4-plugins
- gl-sdk4-qos
- gl-sdk4-repeater
- gl-sdk4-rtty
- gl-sdk4-s2s
- gl-sdk4-switch-button
- gl-sdk4-system
- gl-sdk4-uci
- gl-sdk4-upgrade
- gl-sdk4-utils
- gl-sdk4-vpn-policy
- gl-sdk4-wg-client
- gl-sdk4-wg-server
- gl-sdk4-wifi
- gl-sdk4-ui-adminpw
- gl-sdk4-ui-advanced
- gl-sdk4-ui-backbonerouters
- gl-sdk4-ui-bridge
- gl-sdk4-ui-clients
- gl-sdk4-ui-cloud
- gl-sdk4-ui-core
- gl-sdk4-ui-dnsview
- gl-sdk4-ui-dynamicdns
- gl-sdk4-ui-firewallview
- gl-sdk4-ui-home
- gl-sdk4-ui-internet
- gl-sdk4-ui-ipv6
- gl-sdk4-ui-lanip
- gl-sdk4-ui-login
- gl-sdk4-ui-logview
- gl-sdk4-ui-macclone
- gl-sdk4-ui-ovpnclient
- gl-sdk4-ui-ovpnserver
- gl-sdk4-ui-plugins
- gl-sdk4-ui-process
- gl-sdk4-ui-reset
- gl-sdk4-ui-snooping
- gl-sdk4-ui-threaddevices
- gl-sdk4-ui-threadnetwork
- gl-sdk4-ui-threadtopologies
- gl-sdk4-ui-timezone
- gl-sdk4-ui-upgrade
- gl-sdk4-ui-vpndashboard
- gl-sdk4-ui-welcome
- gl-sdk4-ui-wgclient
- gl-sdk4-ui-wgserver
- gl-sdk4-ui-wireless
diffconfig: |
CONFIG_SIGNATURE_CHECK=n
CONFIG_PACKAGE_dnsmasq=n
CONFIG_PACKAGE_wpad-basic=n
CONFIG_PACKAGE_wpad=n
CONFIG_BUSYBOX_CUSTOM=y
CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
CONFIG_NGINX_HTTP_CHARSET=n
CONFIG_NGINX_HTTP_GZIP=n
CONFIG_NGINX_HTTP_SSI=n
CONFIG_NGINX_HTTP_USERID=n
CONFIG_NGINX_HTTP_ACCESS=n
CONFIG_NGINX_HTTP_AUTH_BASIC=n
CONFIG_NGINX_HTTP_AUTOINDEX=n
CONFIG_NGINX_HTTP_GEO=n
CONFIG_NGINX_HTTP_MAP=n
CONFIG_NGINX_HTTP_SPLIT_CLIENTS=n
CONFIG_NGINX_HTTP_REFERER=n
CONFIG_NGINX_HTTP_REWRITE=n
CONFIG_NGINX_HTTP_FASTCGI=n
CONFIG_NGINX_HTTP_SCGI=n
CONFIG_NGINX_HTTP_MEMCACHED=n
CONFIG_NGINX_HTTP_LIMIT_CONN=n
CONFIG_NGINX_HTTP_LIMIT_REQ=n
CONFIG_NGINX_HTTP_EMPTY_GIF=n
CONFIG_NGINX_HTTP_BROWSER=n
CONFIG_NGINX_HTTP_UPSTREAM_HASH=n
CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH=n
CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN=n
CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE=n
CONFIG_NGINX_HTTP_CACHE=n
CONFIG_NGINX_NAXSI=n
CONFIG_NGINX_HEADERS_MORE=n
CONFIG_LIBCURL_MBEDTLS=n
CONFIG_LIBCURL_OPENSSL=y
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
CONFIG_PACKAGE_wpad-basic-wolfssl=n
CONFIG_PACKAGE_nginx-ssl-util=n
CONFIG_PACKAGE_kmod-crypto-hash=n
CONFIG_PACKAGE_kmod-crypto-kpp=n
CONFIG_PACKAGE_kmod-usb-serial-ch341=n
CONFIG_PACKAGE_libustream-wolfssl=n
uri: https://gitlab.com/gl.sdk4.0/gl.router/gl-sdk4-collect.git
branch: v4.1.0_s200

156
profiles/target_ath79_gl-s200.yml
View File

@ -3,3 +3,159 @@ profile: glinet_gl-s200-nor-nand
target: ath79
subtarget: nand
description: Build image for the GL.iNET S200
feeds:
- name: gl_feeds_commmon
uri: https://github.com/gl-inet/gl-feeds.git
revision: 6d6029902c2f1d3ba56e213feeb39028675dd0e5
- name: gl_feeds
uri: https://github.com/gl-inet/gl-feeds.git
revision: 032786d5ff300ebdd83fb1b5fec5344b3da04953
packages:
- kmod-usb2
- kmod-usb-ehci
- kmod-usb-serial
- kmod-gl-sdk4-hw-info
- kmod-gl-sdk4-tertf
- wpad-openssl
- wget-ssl
- dnsmasq-full
- mwan3
- iwinfo
- gl-oui-rpc
- ot-br-posix
- gl-iot-otbr-gw
- gl-iot-otbr-mgmt
- gl-silabs-dfu
- gl-sdk4-acl
- gl-sdk4-base-files
- gl-sdk4-cable
- gl-sdk4-carrier-monitor
- gl-sdk4-clients
- gl-sdk4-cloud
- gl-sdk4-cloud-batch-manage
- gl-sdk4-ddns
- gl-sdk4-dns
- gl-sdk4-firewall
- gl-sdk4-init-portal
- gl-sdk4-ipv6
- gl-sdk4-lan
- gl-sdk4-led
- gl-sdk4-log
- gl-sdk4-logread
- gl-sdk4-lua-utils
- gl-sdk4-luci
- gl-sdk4-macclone
- gl-sdk4-mqtt
- gl-sdk4-network
- gl-sdk4-network-diag
- gl-sdk4-ovpn-client
- gl-sdk4-ovpn-server
- gl-sdk4-plugins
- gl-sdk4-qos
- gl-sdk4-repeater
- gl-sdk4-rtty
- gl-sdk4-s2s
- gl-sdk4-switch-button
- gl-sdk4-system
- gl-sdk4-uci
- gl-sdk4-upgrade
- gl-sdk4-utils
- gl-sdk4-vpn-policy
- gl-sdk4-wg-client
- gl-sdk4-wg-server
- gl-sdk4-wifi
- gl-sdk4-timer
- gl-sdk4-igmp
- gl-sdk4-mwan3
- gl-led-daemon
- gl-ble-daemon
- gl-ble-to-remote
- gl-ble-sdk
- gl-sdk4-ui-adminpw
- gl-sdk4-ui-advanced
- gl-sdk4-ui-backbonerouters
- gl-sdk4-ui-clients
- gl-sdk4-ui-cloud
- gl-sdk4-ui-core
- gl-sdk4-ui-dnsview
- gl-sdk4-ui-dynamicdns
- gl-sdk4-ui-firewallview
- gl-sdk4-ui-home
- gl-sdk4-ui-internet
- gl-sdk4-ui-ipv6
- gl-sdk4-ui-lanip
- gl-sdk4-ui-login
- gl-sdk4-ui-logview
- gl-sdk4-ui-macclone
- gl-sdk4-ui-ovpnclient
- gl-sdk4-ui-ovpnserver
- gl-sdk4-ui-plugins
- gl-sdk4-ui-process
- gl-sdk4-ui-reset
- gl-sdk4-ui-snooping
- gl-sdk4-ui-threaddevices
- gl-sdk4-ui-threadnetwork
- gl-sdk4-ui-threadtopologies
- gl-sdk4-ui-timezone
- gl-sdk4-ui-upgrade
- gl-sdk4-ui-vpndashboard
- gl-sdk4-ui-welcome
- gl-sdk4-ui-wgclient
- gl-sdk4-ui-wgserver
- gl-sdk4-ui-wireless
- gl-sdk4-ui-timedtask
- gl-sdk4-ui-multiwan
- gl-sdk4-ui-igmp
- gl-sdk4-ui-btnsettings
- gl-sdk4-ui-overview
- gl-sdk4-ui-sensors
- gl-sdk4-ui-bluetoothdevices
- gl-sdk4-ui-bluetoothremotemanage
- gl-sdk4-ui-bluetoothreport
- gl-sdk4-ui-bluetoothsettings
diffconfig: |
CONFIG_PACKAGE_kmod-shortcut-fe-cm=n
CONFIG_SIGNATURE_CHECK=n
CONFIG_PACKAGE_dnsmasq=n
CONFIG_PACKAGE_wpad-basic=n
CONFIG_PACKAGE_wpad=n
CONFIG_BUSYBOX_CUSTOM=y
CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
CONFIG_NGINX_HTTP_CHARSET=n
CONFIG_NGINX_HTTP_GZIP=n
CONFIG_NGINX_HTTP_SSI=n
CONFIG_NGINX_HTTP_USERID=n
CONFIG_NGINX_HTTP_ACCESS=n
CONFIG_NGINX_HTTP_AUTH_BASIC=n
CONFIG_NGINX_HTTP_AUTOINDEX=n
CONFIG_NGINX_HTTP_GEO=n
CONFIG_NGINX_HTTP_MAP=n
CONFIG_NGINX_HTTP_SPLIT_CLIENTS=n
CONFIG_NGINX_HTTP_REFERER=n
CONFIG_NGINX_HTTP_REWRITE=n
CONFIG_NGINX_HTTP_FASTCGI=n
CONFIG_NGINX_HTTP_SCGI=n
CONFIG_NGINX_HTTP_MEMCACHED=n
CONFIG_NGINX_HTTP_LIMIT_CONN=n
CONFIG_NGINX_HTTP_LIMIT_REQ=n
CONFIG_NGINX_HTTP_EMPTY_GIF=n
CONFIG_NGINX_HTTP_BROWSER=n
CONFIG_NGINX_HTTP_UPSTREAM_HASH=n
CONFIG_NGINX_HTTP_UPSTREAM_IP_HASH=n
CONFIG_NGINX_HTTP_UPSTREAM_LEAST_CONN=n
CONFIG_NGINX_HTTP_UPSTREAM_KEEPALIVE=n
CONFIG_NGINX_HTTP_CACHE=n
CONFIG_NGINX_NAXSI=n
CONFIG_NGINX_HEADERS_MORE=n
CONFIG_LIBCURL_MBEDTLS=n
CONFIG_LIBCURL_OPENSSL=y
CONFIG_OPENSSL_OPTIMIZE_SPEED=y
CONFIG_PACKAGE_wpad-basic-wolfssl=n
CONFIG_PACKAGE_nginx-ssl-util=n
CONFIG_PACKAGE_kmod-crypto-hash=n
CONFIG_PACKAGE_kmod-crypto-kpp=n
CONFIG_PACKAGE_kmod-usb-serial-ch341=n
CONFIG_PACKAGE_libustream-wolfssl=n