Add minimalist version; remove not required packages from config

danpawlik · Oct 21, 2024 · ca37b45 · ca37b45
1 parent df33736
commit ca37b45
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 122 deletions.
diff --git a/configs/common/dumb_ap b/configs/common/dumb_ap
@@ -19,15 +19,9 @@ CONFIG_PACKAGE_luci-theme-bootstrap=y
 
 # additional packages
 CONFIG_PACKAGE_vim=y
-CONFIG_PACKAGE_bmon=y
 CONFIG_PACKAGE_htop=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_rsync=y
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_bind-dig=y
-CONFIG_PACKAGE_ethtool-full=y
-CONFIG_PACKAGE_pciutils=y
 CONFIG_PACKAGE_irqbalance=y
 CONFIG_PACKAGE_luci-app-irqbalance=y
 CONFIG_PACKAGE_fping=y
@@ -50,12 +44,11 @@ CONFIG_PACKAGE_collectd-mod-network=y
 CONFIG_PACKAGE_collectd-mod-rrdtool=y
 CONFIG_PACKAGE_collectd-mod-sensors=y
 CONFIG_PACKAGE_collectd-mod-wireless=y
-CONFIG_PACKAGE_collectd-mod-dns=y
 
 ## Better roaming: dawn vs usteer => choose one
-## dawn
-CONFIG_PACKAGE_dawn=y
-CONFIG_PACKAGE_luci-app-dawn=y
+### dawn
+# CONFIG_PACKAGE_dawn is not set
+# CONFIG_PACKAGE_luci-app-dawn is not set
 
 ### usteer
 # CONFIG_PACKAGE_usteer=y
@@ -70,22 +63,6 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m
 CONFIG_PACKAGE_wpad-mbedtls=y
 #######
 
-# temporary workaround for kernel 6.6
-# CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set
-# CONFIG_PACKAGE_kmod-pf-ring is not set
-# CONFIG_PACKAGE_kmod-ovpn-dco-v2 is not set
-# CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common is not set
-# CONFIG_PACKAGE_kmod-mlx5-core is not set
-# CONFIG_PACKAGE_kmod-leds-ubnt-ledbar is not set
-
-### for bridger
-CONFIG_PACKAGE_kmod-sched-core=y
-CONFIG_PACKAGE_kmod-sched-flower=y
-CONFIG_PACKAGE_kmod-sched-bpf=y
-CONFIG_PACKAGE_kmod-sched-act-vlan=y
-CONFIG_PACKAGE_libelf=y
-CONFIG_PACKAGE_libbpf=y
-
 # Debugging
 # CONFIG_PACKAGE_kmod-veth is not set
 

diff --git a/configs/common/main-router b/configs/common/main-router
@@ -31,7 +31,6 @@ CONFIG_PACKAGE_pciutils=y
 # CONFIG_PACKAGE_irqbalance=y
 # CONFIG_PACKAGE_luci-app-irqbalance=y
 CONFIG_PACKAGE_tc-full=y
-# CONFIG_PACKAGE_tc-tiny is not set
 CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
@@ -71,12 +70,13 @@ CONFIG_PACKAGE_collectd-mod-sensors=y
 CONFIG_PACKAGE_collectd-mod-wireless=y
 CONFIG_PACKAGE_collectd-mod-dns=y
 
-## Better roaming: dawn vs usteer => choose one
+##:w
+### 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
+## usteer
 # CONFIG_PACKAGE_usteer=y
 # CONFIG_PACKAGE_luci-app-usteer=y
 

diff --git a/configs/common/openssh b/configs/common/openssh
@@ -1,3 +1,4 @@
+# NOTE: REMEMBER TO OVERWRITE ssh config to allow root login!
 # CONFIG_PACKAGE_dropbear is not set
 CONFIG_PACKAGE_openssh-server=y
 CONFIG_PACKAGE_openssh-sftp-server=y

diff --git a/configs/common/parents b/configs/common/parents
@@ -19,22 +19,14 @@ CONFIG_PACKAGE_luci-theme-bootstrap=y
 
 # additional packages
 CONFIG_PACKAGE_vim=y
-# CONFIG_PACKAGE_bmon is not set
 CONFIG_PACKAGE_htop=y
-# CONFIG_PACKAGE_iperf3 is not set
 CONFIG_PACKAGE_curl=y
-# CONFIG_PACKAGE_rsync is not set
-# CONFIG_PACKAGE_tcpdump is not set
-# CONFIG_PACKAGE_bind-dig is not set
-# CONFIG_PACKAGE_ethtool-full is not set
-# CONFIG_PACKAGE_pciutils is not set
 CONFIG_PACKAGE_irqbalance=y
 CONFIG_PACKAGE_luci-app-irqbalance=y
 CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
 CONFIG_PACKAGE_owut=y
-# CONFIG_PACKAGE_auc is not set
 
 # use experimental kernel
 # CONFIG_TESTING_KERNEL is not set
@@ -43,11 +35,8 @@ CONFIG_PACKAGE_owut=y
 CONFIG_PACKAGE_kmod-wireguard=y
 CONFIG_PACKAGE_wireguard-tools=y
 CONFIG_PACKAGE_luci-proto-wireguard=y
-# CONFIG_PACKAGE_qrencode is not set
 
 ## https dns
-# CONFIG_PACKAGE_dnscrypt-proxy2 is not set
-# CONFIG_PACKAGE_https-dns-proxy is not set
 CONFIG_PACKAGE_unbound-daemon=y
 CONFIG_PACKAGE_luci-app-unbound=y
 
@@ -63,9 +52,9 @@ CONFIG_PACKAGE_collectd-mod-memory=y
 CONFIG_PACKAGE_collectd-mod-rrdtool=y
 CONFIG_PACKAGE_collectd-mod-sensors=y
 CONFIG_PACKAGE_collectd-mod-wireless=y
-#CONFIG_PACKAGE_collectd-mod-dns is not set
+# CONFIG_PACKAGE_collectd-mod-dns is not set
 
-## Better roaming: dawn vs usteer => choose one
+### Better roaming: dawn vs usteer => choose one
 ## dawn
 # CONFIG_PACKAGE_dawn=y
 # CONFIG_PACKAGE_luci-app-dawn=y
@@ -83,25 +72,6 @@ CONFIG_PACKAGE_wpad-basic-mbedtls=m
 CONFIG_PACKAGE_wpad-mbedtls=y
 #######
 
-# temporary workaround for kernel 6.6
-# CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set
-# CONFIG_PACKAGE_kmod-pf-ring is not set
-# CONFIG_PACKAGE_kmod-ovpn-dco-v2 is not set
-# CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common is not set
-# CONFIG_PACKAGE_kmod-mlx5-core is not set
-# CONFIG_PACKAGE_kmod-leds-ubnt-ledbar is not set
-
-### for bridger
-# CONFIG_PACKAGE_kmod-sched-core is not set
-# CONFIG_PACKAGE_kmod-sched-flower is not set
-# CONFIG_PACKAGE_kmod-sched-bpf is not set
-# CONFIG_PACKAGE_kmod-sched-act-vlan is not set
-# CONFIG_PACKAGE_libelf is not set
-# CONFIG_PACKAGE_libbpf is not set
-
-# Debugging
-# CONFIG_PACKAGE_kmod-veth is not set
-
 CONFIG_ALL_KMODS=y
 CONFIG_ALL_NONSHARED=y
 CONFIG_AUTOREMOVE=y
diff --git a/configs/common/parents-minimal b/configs/common/parents-minimal
@@ -19,22 +19,12 @@ CONFIG_PACKAGE_luci-theme-bootstrap=y
 
 # additional packages
 CONFIG_PACKAGE_vim=y
-# CONFIG_PACKAGE_bmon=y
 CONFIG_PACKAGE_htop=y
-# CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_curl=y
-# CONFIG_PACKAGE_rsync=y
-# CONFIG_PACKAGE_tcpdump is not set
-# CONFIG_PACKAGE_bind-dig=y
-# CONFIG_PACKAGE_ethtool-full is not set
-# CONFIG_PACKAGE_pciutils is not set
-# CONFIG_PACKAGE_irqbalance is not set
-# CONFIG_PACKAGE_luci-app-irqbalance is not set
 CONFIG_PACKAGE_fping=y
 
 # attendedsysupgrade / owut
 CONFIG_PACKAGE_owut=y
-# CONFIG_PACKAGE_auc is not set
 
 # use experimental kernel
 # CONFIG_TESTING_KERNEL is not set
@@ -51,20 +41,11 @@ CONFIG_PACKAGE_collectd-mod-interface=y
 CONFIG_PACKAGE_collectd-mod-iwinfo=y
 CONFIG_PACKAGE_collectd-mod-load=y
 CONFIG_PACKAGE_collectd-mod-memory=y
-# CONFIG_PACKAGE_collectd-mod-network is not set
+CONFIG_PACKAGE_collectd-mod-network=y
 CONFIG_PACKAGE_collectd-mod-rrdtool=y
 CONFIG_PACKAGE_collectd-mod-sensors=y
 CONFIG_PACKAGE_collectd-mod-wireless=y
-#CONFIG_PACKAGE_collectd-mod-dns is not set
-
-## Better roaming: dawn vs usteer => choose one
-## dawn
-# CONFIG_PACKAGE_dawn=y
-# CONFIG_PACKAGE_luci-app-dawn=y
-
-### usteer
-# CONFIG_PACKAGE_usteer it not set
-# CONFIG_PACKAGE_luci-app-usteer it not set
+ONFIG_PACKAGE_collectd-mod-dns=y
 
 # language
 CONFIG_LUCI_LANG_pl=y
@@ -73,26 +54,7 @@ CONFIG_LUCI_LANG_pl=y
 # Remove section and copy from config/common/ a cryptolib section that you need.
 CONFIG_PACKAGE_wpad-basic-mbedtls=m
 CONFIG_PACKAGE_wpad-mbedtls=y
-#######
-
-# temporary workaround for kernel 6.6
-# CONFIG_PACKAGE_kmod-usb-serial-dmx_usb_module is not set
-# CONFIG_PACKAGE_kmod-pf-ring is not set
-# CONFIG_PACKAGE_kmod-ovpn-dco-v2 is not set
-# CONFIG_PACKAGE_kmod-usb-serial-xr_usb_serial_common is not set
-# CONFIG_PACKAGE_kmod-mlx5-core is not set
-# CONFIG_PACKAGE_kmod-leds-ubnt-ledbar is not set
-
-### for bridger
-# CONFIG_PACKAGE_kmod-sched-core is not set
-# CONFIG_PACKAGE_kmod-sched-flower is not set
-# CONFIG_PACKAGE_kmod-sched-bpf is not set
-# CONFIG_PACKAGE_kmod-sched-act-vlan is not set
-# CONFIG_PACKAGE_libelf is not set
-# CONFIG_PACKAGE_libbpf is not set
-
-# Debugging
-# CONFIG_PACKAGE_kmod-veth is not set
+###############################
 
 CONFIG_ALL_KMODS=y
 CONFIG_ALL_NONSHARED=y

diff --git a/openwrt-configure.sh b/openwrt-configure.sh
@@ -9,20 +9,15 @@ ROUTER_IP="${ROUTER_IP=$1}"
 DEVICE="${DEVICE:-$2}"
 FULL_WPAD="${FULL_WPAD:-'true'}"
 INSTALL_BRIDGER=${INSTALL_BRIDGER:-'false'}
-INSTALL_DAWN=${INSTALL_DAWN:-'true'}
+INSTALL_DAWN=${INSTALL_DAWN:-'false'}
 INSTALL_USTEER=${INSTALL_USTEER:-'false'}
-INSTALL_HTTPS_DNS_PROXY=${INSTALL_HTTPS_DNS_PROXY:-'false'}
 INSTALL_DNSCRYPT_PROXY2=${INSTALL_DNSCRYPT_PROXY2:-'false'}
 INSTALL_UNBOUND=${INSTALL_UNBOUND:-'true'}
 CRYPTO_LIB=${CRYPTO_LIB:-'openssl'} # wolfssl or openssl; if empty - mbedtls
-ADDITIONAL_DRIVERS=${ADDITIONAL_DRIVERS:-'kmod-mt7921e kmod-mt7921-common kmod-mt7921-firmware kmod-mt7925-common kmod-mt7925e'}
+# ADDITIONAL_DRIVERS=${ADDITIONAL_DRIVERS:-'kmod-mt7921e kmod-mt7921-common kmod-mt7921-firmware kmod-mt7925-common kmod-mt7925e'}
+ADDITIONAL_DRIVERS=${ADDITIONAL_DRIVERS:-''}
 INSTALL_LANG_PACKAGES=${INSTALL_LANG_PACKAGES:-'true'}
-
-# To replace mbedtls with openssl via firmware-selector, just add:
-# -wpad-basic-mbedtls -libustream-mbedtls -libmbedtls libustream-openssl wpad-openssl
-#
-# To replace mbedtls with wolfssl via firmware-selector, just add:
-# -wpad-basic-mbedtls -libustream-mbedtls -libmbedtls libustream-wolfssl wpad-wolfssl
+INSTALL_MINIMUM_PACKAGES=${INSTALL_MINIMUM_PACKAGES:-'false'}
 
 if [ -z "$ROUTER_IP" ]; then
     echo "Please provide router ip like: 192.168.1.1"
@@ -53,10 +48,16 @@ fi
 # basic packages
 PACKAGES="collectd collectd-mod-sensors \
 collectd-mod-dns collectd-mod-wireless \
-luci-app-statistics luci vim htop \
-curl iperf3 owut bmon \
-irqbalance luci-app-irqbalance rsync \
-bind-dig ethtool-full pciutils tcpdump"
+luci-app-statistics luci vim htop curl iperf3 owut \
+irqbalance luci-app-irqbalance"
+
+if [[ "$INSTALL_MINIMUM_PACKAGES" =~ False|false ]]; then
+    PACKAGES="$PACKAGES bmon rsync bind-dig ethtool-full pciutils tcpdump"
+else
+    if [[ "$CRYPTO_LIB" =~ ^(Wolfssl|wolfssl|Openssl|openssl)$ ]]; then
+        echo -e "By choosing INSTALL_MINIMUM_PACKAGES, consider to use:\n\n export CRYPTO_LIB=mbedtls\n\n"
+    fi
+fi
 
 if [[ "$INSTALL_DAWN" =~ True|true ]]; then
     PACKAGES="$PACKAGES dawn luci-app-dawn"
@@ -71,14 +72,11 @@ if [[ "$DEVICE" =~ Main|main ]]; then
     PACKAGES="$PACKAGES luci-proto-wireguard kmod-wireguard wireguard-tools qrencode"
     PACKAGES="$PACKAGES luci-app-sqm"
     PACKAGES="$PACKAGES ddns-scripts luci-app-ddns bind-host"
-    if [[ "$INSTALL_HTTPS_DNS_PROXY" =~ True|true ]]; then
-        PACKAGES="$PACKAGES https-dns-proxy luci-app-https-dns-proxy luci-i18n-https-dns-proxy-pl libcurl4 libnghttp3 libngtcp2"
-    fi
     if [[ "$INSTALL_DNSCRYPT_PROXY2" =~ True|true ]]; then
         PACKAGES="$PACKAGES dnscrypt-proxy2"
     fi
     if [[ "$INSTALL_UNBOUND" =~ True|true ]]; then
-        PACKAGES="$PACKAGES unbound-daemon"
+        PACKAGES="$PACKAGES unbound-daemon luci-app-unbound"
     fi
 fi
 
@@ -120,7 +118,7 @@ esac
 #       luci-proto-wireguard kmod-wireguard wireguard-tools qrencode
 
 ### DNS over HTTPS
-#       https-dns-proxy luci-app-https-dns-proxy luci-i18n-https-dns-proxy-pl libcurl4 libnghttp3 libngtcp2
+        unbound-daemon luci-app-unbound
 
 ### DDNS
 #       ddns-scripts luci-app-ddns bind-host
@@ -138,3 +136,9 @@ esac
 
 # to enable 802.11k/v replace:
 # wpad-basic-mbedtls with wpad-mbedtls
+
+# To replace mbedtls with openssl via firmware-selector, just add:
+# -wpad-basic-mbedtls -libustream-mbedtls -libmbedtls libustream-openssl wpad-openssl
+#
+# To replace mbedtls with wolfssl via firmware-selector, just add:
+# -wpad-basic-mbedtls -libustream-mbedtls -libmbedtls libustream-wolfssl wpad-wolfssl