From 298c1a4b7456cbe3458eadd94604ebd97245a5e4 Mon Sep 17 00:00:00 2001 From: Petko Bordjukov Date: Fri, 4 Nov 2016 02:32:40 +0200 Subject: [PATCH] Last minute configuration updates --- Rakefile | 2 +- ...openwrt.configdiff => archer-c5.configdiff | 9 +++-- configurations.yml | 18 ++++----- ar71xx-lede.configdiff => dap2965.configdiff | 10 +++-- files/archer-c5/etc/config/wireless | 8 ++-- files/linksys-single-trunk/etc/config/network | 37 +++++++++++++++++++ files/wdr-4300/etc/config/wireless | 8 ++-- 7 files changed, 67 insertions(+), 25 deletions(-) rename ar71xx-openwrt.configdiff => archer-c5.configdiff (93%) rename ar71xx-lede.configdiff => dap2965.configdiff (91%) create mode 100644 files/linksys-single-trunk/etc/config/network diff --git a/Rakefile b/Rakefile index 82a1e7a..cc39a9a 100644 --- a/Rakefile +++ b/Rakefile @@ -57,7 +57,7 @@ end task :all do aps = %W(ap-l0-1 ap-l0-2 ap-l1-1 ap-l1-2 ap-c-1 ap-c-2 ap-ma-1 ap-mu-1 ap-noc-1) - aps = %W(ap-bg-1 ap-bg-2 ap-bg-3 ap-bg-4) + aps += %W(ap-bg-1 ap-bg-2 ap-bg-3 ap-bg-4) aps.each do |ap| Rake::Task["ap"].reenable diff --git a/ar71xx-openwrt.configdiff b/archer-c5.configdiff similarity index 93% rename from ar71xx-openwrt.configdiff rename to archer-c5.configdiff index 7b8e771..99f8bad 100644 --- a/ar71xx-openwrt.configdiff +++ b/archer-c5.configdiff @@ -1,6 +1,6 @@ CONFIG_TARGET_ar71xx=y CONFIG_TARGET_ar71xx_generic=y -CONFIG_TARGET_ar71xx_generic_Default=y +CONFIG_TARGET_ar71xx_generic_ARCHERC7=y CONFIG_ALL_KMODS=y CONFIG_ATH_USER_REGD=y CONFIG_BWMNG_EXTENDEDSTATS=y @@ -10,7 +10,7 @@ CONFIG_IMAGEOPT=y # CONFIG_KERNEL_KALLSYMS is not set CONFIG_LUCI_SRCDIET=y CONFIG_PACKAGE_ATH_DEBUG=y -# CONFIG_PACKAGE_ath10k-firmware-qca988x is not set +CONFIG_PACKAGE_ath10k-firmware-qca988x=m CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=y CONFIG_PACKAGE_bwm-ng=y CONFIG_PACKAGE_collectd=y @@ -35,7 +35,6 @@ CONFIG_PACKAGE_htop=y # CONFIG_PACKAGE_ip6tables is not set # CONFIG_PACKAGE_iptables is not set CONFIG_PACKAGE_kmod-8021q=y -CONFIG_PACKAGE_kmod-ath10k=y CONFIG_PACKAGE_kmod-bridge=y CONFIG_PACKAGE_kmod-ebtables=y CONFIG_PACKAGE_kmod-ebtables-ipv4=y @@ -53,6 +52,7 @@ CONFIG_PACKAGE_kmod-pppoe=m CONFIG_PACKAGE_kmod-pppox=m CONFIG_PACKAGE_kmod-slhc=m CONFIG_PACKAGE_kmod-stp=y +CONFIG_PACKAGE_kmod-usb-ohci=y CONFIG_PACKAGE_libcap=y # CONFIG_PACKAGE_libip6tc is not set CONFIG_PACKAGE_libiwinfo-lua=y @@ -74,6 +74,7 @@ CONFIG_PACKAGE_sudo=y CONFIG_PACKAGE_tcpdump=m CONFIG_PACKAGE_tcpdump-mini=y CONFIG_PACKAGE_terminfo=y +CONFIG_PACKAGE_uboot-ar71xx-nbg460n_550n_550nh=y CONFIG_PACKAGE_wavemon=y CONFIG_PACKAGE_wifi-sentinel=y CONFIG_PACKAGE_wireless-tools=y @@ -91,4 +92,4 @@ CONFIG_VERSION_NICK="Chaos Calmer" CONFIG_VERSION_NUMBER="15.05" CONFIG_VERSION_PRODUCT="" CONFIG_VERSION_REPO="http://downloads.openwrt.org/%n/%v/%S/packages" -CONFIG_WPA_SUPPLICANT_INTERNAL=y +CONFIG_WPA_SUPPLICANT_INTERNAL=y \ No newline at end of file diff --git a/configurations.yml b/configurations.yml index acb3129..75ffbd6 100644 --- a/configurations.yml +++ b/configurations.yml @@ -15,7 +15,7 @@ configurations: - linksys - linksys-dual-trunk ap-bg-2: - config: ar71xx-lede + config: dap2965 ip: 10.20.0.201 wlans: 0: @@ -29,7 +29,7 @@ configurations: - dap2965 - dap2965-video ap-bg-3: - config: ar71xx-lede + config: dap2965 ip: 10.20.0.202 wlans: 0: @@ -71,7 +71,7 @@ configurations: - linksys - linksys-single-trunk ap-c-2: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.205 wlans: 0: @@ -85,7 +85,7 @@ configurations: - archer-c5 - archer-c5-single-trunk ap-mu-1: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.206 wlans: 0: @@ -99,7 +99,7 @@ configurations: - archer-c5 - archer-c5-single-trunk ap-ma-1: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.207 wlans: 0: @@ -113,7 +113,7 @@ configurations: - archer-c5 - archer-c5-single-trunk ap-l0-1: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.208 wlans: 0: @@ -137,7 +137,7 @@ configurations: # - all # - rs ap-l0-2: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.210 wlans: 0: @@ -151,7 +151,7 @@ configurations: - archer-c5 - archer-c5-single-trunk ap-l1-1: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.211 wlans: 0: @@ -165,7 +165,7 @@ configurations: - archer-c5 - archer-c5-single-trunk ap-noc-1: - config: ar71xx-openwrt + config: archer-c5 ip: 10.20.0.212 wlans: 0: diff --git a/ar71xx-lede.configdiff b/dap2965.configdiff similarity index 91% rename from ar71xx-lede.configdiff rename to dap2965.configdiff index a315859..32b3a6e 100644 --- a/ar71xx-lede.configdiff +++ b/dap2965.configdiff @@ -1,12 +1,13 @@ CONFIG_TARGET_ar71xx=y CONFIG_TARGET_ar71xx_generic=y -CONFIG_TARGET_ar71xx_generic_Default=y +CONFIG_TARGET_ar71xx_generic_DEVICE_dap-2695-a1=y CONFIG_ALL_KMODS=y CONFIG_BWMNG_EXTENDEDSTATS=y CONFIG_BWMNG_TIME=y CONFIG_DROPBEAR_ECC=y CONFIG_ETHTOOL_PRETTY_DUMP=y CONFIG_PACKAGE_ATH_DEBUG=y +CONFIG_PACKAGE_ath10k-firmware-qca988x=m CONFIG_PACKAGE_ath10k-firmware-qca988x-ct=y CONFIG_PACKAGE_bmon=y CONFIG_PACKAGE_bwm-ng=y @@ -31,7 +32,6 @@ CONFIG_PACKAGE_horst=y CONFIG_PACKAGE_hostapd-utils=y CONFIG_PACKAGE_ip6tables=m CONFIG_PACKAGE_iptables=m -CONFIG_PACKAGE_kmod-ath10k=y CONFIG_PACKAGE_kmod-br-netfilter=y CONFIG_PACKAGE_kmod-bridge=y CONFIG_PACKAGE_kmod-ebtables=y @@ -44,7 +44,12 @@ CONFIG_PACKAGE_kmod-nf-conntrack=m CONFIG_PACKAGE_kmod-nf-conntrack6=m CONFIG_PACKAGE_kmod-nf-ipt6=m CONFIG_PACKAGE_kmod-nf-nat=m +CONFIG_PACKAGE_kmod-nls-base=y CONFIG_PACKAGE_kmod-stp=y +CONFIG_PACKAGE_kmod-usb-core=y +CONFIG_PACKAGE_kmod-usb-ledtrig-usbport=y +CONFIG_PACKAGE_kmod-usb-ohci=y +CONFIG_PACKAGE_kmod-usb2=y CONFIG_PACKAGE_libgmp=y CONFIG_PACKAGE_libip6tc=m CONFIG_PACKAGE_libltdl=y @@ -74,4 +79,3 @@ CONFIG_PACKAGE_wpad=y # CONFIG_PACKAGE_wpad-mini is not set CONFIG_PACKAGE_zlib=y CONFIG_WPA_SUPPLICANT_INTERNAL=y -CONFIG_PACKAGE_ath10k-firmware-qca988x=m diff --git a/files/archer-c5/etc/config/wireless b/files/archer-c5/etc/config/wireless index 73ccc66..2b92051 100644 --- a/files/archer-c5/etc/config/wireless +++ b/files/archer-c5/etc/config/wireless @@ -22,8 +22,8 @@ config wifi-iface # option macaddr '' option isolate '1' option iapp_interface 'management' - option wnm_sleep_mode 1 - option proxy_arp 1 +# option wnm_sleep_mode 1 +# option proxy_arp 1 config wifi-device radio1 option type mac80211 @@ -49,6 +49,6 @@ config wifi-iface # option macaddr '' option isolate '1' option iapp_interface 'management' - option wnm_sleep_mode 1 - option proxy_arp 1 +# option wnm_sleep_mode 1 +# option proxy_arp 1 diff --git a/files/linksys-single-trunk/etc/config/network b/files/linksys-single-trunk/etc/config/network new file mode 100644 index 0000000..e4f7496 --- /dev/null +++ b/files/linksys-single-trunk/etc/config/network @@ -0,0 +1,37 @@ +config interface 'loopback' + option ifname 'lo' + option proto 'static' + option ipaddr '127.0.0.1' + option netmask '255.0.0.0' + +config interface 'management' + option ifname 'eth0' + option proto 'static' + option ipaddr '' + option netmask '255.255.255.0' + option gateway '10.20.0.1' + option dns '10.20.0.1' + option ipv6 'no' + +config interface 'wireless' + option ifname 'eth1' + option proto 'none' + option ipv6 'no' + option force_link '1' + option type 'bridge' + +config switch + option name 'switch0' + option reset '1' + option enable_vlan '1' + +config switch_vlan + option device 'switch0' + option vlan '20' + option ports '4t 5' + +config switch_vlan + option device 'switch0' + option vlan '22' + option ports '4t 6' + diff --git a/files/wdr-4300/etc/config/wireless b/files/wdr-4300/etc/config/wireless index 45c3e48..0a89173 100644 --- a/files/wdr-4300/etc/config/wireless +++ b/files/wdr-4300/etc/config/wireless @@ -22,8 +22,8 @@ config wifi-iface # option macaddr '' option isolate '1' option iapp_interface 'management' - option wnm_sleep_mode 1 - option proxy_arp 1 +# option wnm_sleep_mode 1 +# option proxy_arp 1 config wifi-device radio1 option type mac80211 @@ -49,5 +49,5 @@ config wifi-iface # option macaddr '' option isolate '1' option iapp_interface 'management' - option wnm_sleep_mode 1 - option proxy_arp 1 +# option wnm_sleep_mode 1 +# option proxy_arp 1