From 823b24fbf98db873203cc36836d3adb8eb70862d Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: Wed, 28 Feb 2024 13:02:33 +0100
Subject: [PATCH] Add libe2p lib to Dockerfile; once again come back to usteer

---
 Dockerfile                        |  3 ++-
 configs/mediatek/mt7622/dumb_ap   | 10 +++++-----
 configs/mediatek/mt7988a/extended | 13 +++++++------
 openwrt-configure.sh              |  7 ++++++-
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d045208..15d25f0 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,8 @@ RUN dnf -y install vim bash-completion bzip2 gcc gcc-c++ git make ncurses-devel
     m4 wireshark-cli python3-netifaces python3-unidecode \
     python3-sqlparse python3-aiosignal python3-charset-normalizer python3-frozenlist \
     python3-networkx python3-setuptools luajit2.1-luv libnghttp2-devel \
-    perl-Time-Piece perl-Test-CPAN-Meta-JSON net-snmp-libs && dnf clean all
+    perl-Time-Piece perl-Test-CPAN-Meta-JSON net-snmp-libs \
+    e2fsprogs-libs && dnf clean all
 
 RUN ln -s /usr/lib64/$(ls /usr/lib64/ | grep libbz2 | sort -r | head -n1) /usr/lib64/libbz2.so.1.0 || true ; \
     ln -s /usr/lib64/$(ls /usr/lib64/ | grep libbz2 | sort -r | head -n1) /usr/lib64/libbz2.so.1 || true
diff --git a/configs/mediatek/mt7622/dumb_ap b/configs/mediatek/mt7622/dumb_ap
index d4310fb..cdb87e1 100644
--- a/configs/mediatek/mt7622/dumb_ap
+++ b/configs/mediatek/mt7622/dumb_ap
@@ -82,13 +82,13 @@ CONFIG_PACKAGE_collectd-mod-dns=y
 # CONFIG_PACKAGE_luci-app-vnstat2=y
 
 ## Better roaming: dawn vs usteer => choose one
-# dawn
-CONFIG_PACKAGE_dawn=y
-CONFIG_PACKAGE_luci-app-dawn=y
+## dawn
+#CONFIG_PACKAGE_dawn=y
+#CONFIG_PACKAGE_luci-app-dawn=y
 
 ### usteer
-#CONFIG_PACKAGE_usteer=y
-#CONFIG_PACKAGE_luci-app-usteer=y
+CONFIG_PACKAGE_usteer=y
+CONFIG_PACKAGE_luci-app-usteer=y
 
 # language
 CONFIG_LUCI_LANG_pl=y
diff --git a/configs/mediatek/mt7988a/extended b/configs/mediatek/mt7988a/extended
index c49c766..44e924e 100644
--- a/configs/mediatek/mt7988a/extended
+++ b/configs/mediatek/mt7988a/extended
@@ -98,12 +98,12 @@ CONFIG_PACKAGE_luci-app-vnstat2=y
 
 ## Better roaming: dawn vs usteer => choose one
 ## dawn
-CONFIG_PACKAGE_dawn=y
-CONFIG_PACKAGE_luci-app-dawn=y
+#CONFIG_PACKAGE_dawn=y
+#CONFIG_PACKAGE_luci-app-dawn=y
 
 ### usteer
-#CONFIG_PACKAGE_usteer=y
-#CONFIG_PACKAGE_luci-app-usteer=y
+CONFIG_PACKAGE_usteer=y
+CONFIG_PACKAGE_luci-app-usteer=y
 
 # sqm
 CONFIG_PACKAGE_luci-app-sqm=y
@@ -124,6 +124,7 @@ CONFIG_PACKAGE_kmod-mt7921-firmware=y
 CONFIG_PACKAGE_kmod-mt7921e=y
 
 # Intel BE200
+CONFIG_PACKAGE_kmod-iwlwifi=y
 CONFIG_PACKAGE_iwlwifi-firmware-be200=y
 
 ## debuging
@@ -132,8 +133,8 @@ CONFIG_PACKAGE_blockd=m
 CONFIG_PACKAGE_mtdev=m
 CONFIG_PACKAGE_kmod-mtd-rw=y
 
-## Additional configs to be more "compatible" with OpenWRT build bots.
-## https://downloads.openwrt.org/snapshots/targets/mediatek/filogic/config.buildinfo
+### Additional configs to be more "compatible" with OpenWRT build bots.
+### https://downloads.openwrt.org/snapshots/targets/mediatek/filogic/config.buildinfo
 #CONFIG_ALL_KMODS=y
 #CONFIG_ALL_NONSHARED=y
 #CONFIG_BPF_TOOLCHAIN_BUILD_LLVM=y
diff --git a/openwrt-configure.sh b/openwrt-configure.sh
index c8e54ad..0cfc2e2 100755
--- a/openwrt-configure.sh
+++ b/openwrt-configure.sh
@@ -27,7 +27,8 @@ COMMAND="$COMMAND; opkg install collectd collectd-mod-sensors \
 collectd-mod-dns collectd-mod-wireless \
 luci-app-statistics luci luci-i18n-base-pl vim htop \
 curl iperf3 luci-app-attendedsysupgrade \
-auc bmon irqbalance luci-app-irqbalance rsync"
+auc bmon irqbalance luci-app-irqbalance rsync \
+bind-dig ethtool-full pciutils tcpdump"
 
 if [[ "$INSTALL_DAWN" =~ True|true ]]; then
     COMMAND="$COMMAND dawn luci-app-dawn"
@@ -38,6 +39,7 @@ fi
 if [[ "$DEVICE" =~ Main|main ]]; then
     COMMAND="$COMMAND luci-app-wireguard luci-proto-wireguard kmod-wireguard wireguard-tools qrencode"
     COMMAND="$COMMAND https-dns-proxy luci-app-https-dns-proxy luci-i18n-https-dns-proxy-pl libcurl4 libnghttp3 libngtcp2"
+    COMMAND="$COMMAND luci-app-vnstat2"
     COMMAND="$COMMAND luci-app-sqm"
     COMMAND="$COMMAND ddns-scripts luci-app-ddns bind-host"
 fi
@@ -68,6 +70,9 @@ esac
 ### basic
 #       opkg update;
 #       opkg install collectd collectd-mod-sensors collectd-mod-dns collectd-mod-wireless luci-app-statistics luci luci-i18n-base-pl vim htop curl iperf3 luci-app-attendedsysupgrade auc bmon irqbalance luci-app-irqbalance rsync
+#
+### additional
+#       opkg install bind-dig ethtool-full pciutils tcpdump luci-app-vnstat2
 
 ### wireguard
 #       luci-app-wireguard luci-proto-wireguard kmod-wireguard wireguard-tools qrencode