From 0dcd1ed41526723e6043a198e02fbfc0d6af123c Mon Sep 17 00:00:00 2001
From: Josef Schlehofer <josef.schlehofer@nic.cz>
Date: Mon, 11 Feb 2019 14:27:30 +0100
Subject: [PATCH] base_packages: re-sorted packages to be more clear

---
 configs/common/base_packages | 144 ++++++++++++++++++++++-------------
 1 file changed, 89 insertions(+), 55 deletions(-)

diff --git a/configs/common/base_packages b/configs/common/base_packages
index d728f4962..2320895cd 100644
--- a/configs/common/base_packages
+++ b/configs/common/base_packages
@@ -1,37 +1,84 @@
-CONFIG_PACKAGE_busybox-static=m
-CONFIG_PACKAGE_c-rehash=y
-CONFIG_PACKAGE_cert-backup=y
-CONFIG_PACKAGE_create_notification=y
+# CZ NIC packages
 CONFIG_PACKAGE_cznic-cacert-bundle=y
 CONFIG_PACKAGE_cznic-repo-keys=y
 CONFIG_PACKAGE_cznic-repo-keys-test=y
+CONFIG_PACKAGE_c-rehash=y
+CONFIG_PACKAGE_cert-backup=y
+CONFIG_PACKAGE_create_notification=y
+CONFIG_PACKAGE_oneshot=y
+CONFIG_PACKAGE_thermometer=y
+CONFIG_PACKAGE_nethist=y
+CONFIG_PACKAGE_server-uplink=y
+CONFIG_PACKAGE_update_mac=y
+CONFIG_PACKAGE_libatsha204=y
+CONFIG_PACKAGE_user_notify=y
+CONFIG_PACKAGE_watchdog_adjust=y
+CONFIG_PACKAGE_userspace_time_sync=y
+CONFIG_PACKAGE_start-indicator=y
+CONFIG_PACKAGE_vixie-cron=y
+
+# Turris packages
 CONFIG_PACKAGE_turris-utils=y
 CONFIG_PACKAGE_turris-maintain=y
 CONFIG_PACKAGE_turris-webapps=y
+CONFIG_PACKAGE_turris-version=y
+CONFIG_PACKAGE_schnapps=y
+CONFIG_PACKAGE_dnssec-rootkey=y
+CONFIG_PACKAGE_resolver-conf=y
+
+# Foris packages
 CONFIG_PACKAGE_foris=y
 CONFIG_PACKAGE_foris-client=y
 CONFIG_PACKAGE_foris-controller=y
 CONFIG_PACKAGE_foris-diagnostics-plugin=y
 CONFIG_PACKAGE_foris-l10n-cs=y
 CONFIG_PACKAGE_foris-ws=y
-CONFIG_PACKAGE_turris-version=y
-CONFIG_PACKAGE_gettext-tools=y
-CONFIG_PACKAGE_libatsha204=y
-CONFIG_PACKAGE_oneshot=y
-CONFIG_PACKAGE_thermometer=y
-CONFIG_PACKAGE_nethist=y
-CONFIG_PACKAGE_server-uplink=y
-CONFIG_PACKAGE_syslog-ng=y
-CONFIG_PACKAGE_update_mac=y
+
+# Updater packages
 CONFIG_PACKAGE_updater-ng=y
 CONFIG_PACKAGE_updater-ng-supervisor=y
 CONFIG_PACKAGE_updater-ng-localrepo=y
 CONFIG_PACKAGE_updater-ng-opkg=y
-CONFIG_PACKAGE_user_notify=y
-CONFIG_PACKAGE_schnapps=y
-CONFIG_PACKAGE_userspace_time_sync=y
-CONFIG_PACKAGE_vixie-cron=y
-CONFIG_PACKAGE_watchdog_adjust=y
+
+# Base packages
+CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_logrotate=y
+CONFIG_PACKAGE_curl=y
+CONFIG_PACKAGE_wget=y
+CONFIG_PACKAGE_syslog-ng=y
+CONFIG_PACKAGE_ntpdate=y
+CONFIG_PACKAGE_i2c-tools=y
+CONFIG_PACKAGE_haveged=y
+CONFIG_PACKAGE_msmtp=y
+CONFIG_PACKAGE_gettext-tools=y
+CONFIG_PACKAGE_node=n
+
+# uhttpd
+CONFIG_PACKAGE_uhttpd=m
+CONFIG_PACKAGE_uhttpd-mod-ubus=m
+
+# Network related packages
+CONFIG_PACKAGE_at=y
+
+CONFIG_PACKAGE_dnsmasq=n
+CONFIG_PACKAGE_dnsmasq-full=y
+CONFIG_PACKAGE_umdns=y
+
+CONFIG_PACKAGE_ip-full=y
+CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_ip6tables=y
+CONFIG_PACKAGE_iputils-ping=y
+CONFIG_PACKAGE_ppp-mod-pppoa=n
+
+CONFIG_PACKAGE_socat=y
+CONFIG_SOCAT_SSL=y
+
+CONFIG_ETHTOOL_PRETTY_DUMP=y
+
+# Fancy stuff like LEDs
+CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
+
+# LuCI
 CONFIG_PACKAGE_luci-base=y
 CONFIG_PACKAGE_luci=y
 CONFIG_PACKAGE_luci-lighttpd=y
@@ -41,61 +88,48 @@ CONFIG_PACKAGE_luci-app-firewall=y
 CONFIG_PACKAGE_luci-theme-bootstrap=y
 CONFIG_PACKAGE_luci-proto-ipv6=y
 CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_msmtp=y
-CONFIG_PACKAGE_curl=y
-CONFIG_PACKAGE_wget=y
-CONFIG_PACKAGE_ip6tables=y
-CONFIG_PACKAGE_iptables=y
-CONFIG_PACKAGE_dnssec-rootkey=y
-CONFIG_PACKAGE_resolver-conf=y
-CONFIG_PACKAGE_ip-full=y
+
+# SSH packages
+CONFIG_PACKAGE_dropbear=m
+
+# OpenSSH packages
 CONFIG_PACKAGE_openssh-client=y
 CONFIG_PACKAGE_openssh-client-utils=y
+CONFIG_PACKAGE_openssh-sftp-client=y
 CONFIG_PACKAGE_openssh-keygen=y
 CONFIG_PACKAGE_openssh-moduli=y
 CONFIG_PACKAGE_openssh-server=y
-CONFIG_PACKAGE_openssh-sftp-client=y
 CONFIG_PACKAGE_openssh-sftp-server=y
-CONFIG_PACKAGE_dropbear=m
+
+
+# Lighttpd packages
 CONFIG_PACKAGE_lighttpd=y
+CONFIG_PACKAGE_lighttpd-luci=y
+
 CONFIG_LIGHTTPD_SSL=y
 CONFIG_PACKAGE_lighttpd-https-cert=y
-CONFIG_PACKAGE_lighttpd-luci=y
+
 CONFIG_PACKAGE_lighttpd-mod-fastcgi=y
 CONFIG_PACKAGE_lighttpd-mod-openssl=y
 CONFIG_PACKAGE_lighttpd-mod-proxy=y
 CONFIG_PACKAGE_lighttpd-mod-redirect=y
-CONFIG_PACKAGE_uhttpd=m
-CONFIG_PACKAGE_uhttpd-mod-ubus=m
-CONFIG_PACKAGE_ethtool=y
-CONFIG_ETHTOOL_PRETTY_DUMP=y
+
+# Wireless packages
 CONFIG_PACKAGE_hostapd-common=y
-CONFIG_PACKAGE_iputils-ping=y
-CONFIG_PACKAGE_socat=y
-CONFIG_SOCAT_SSL=y
+CONFIG_PACKAGE_iw=n
+CONFIG_PACKAGE_iw-full=y
+CONFIG_PACKAGE_iwinfo=y
+CONFIG_PACKAGE_wpad=y
+CONFIG_PACKAGE_wpad-mini=n
+
+# Drivers for Wireless
 CONFIG_DRIVER_11N_SUPPORT=y
 CONFIG_DRIVER_11AC_SUPPORT=y
 CONFIG_DRIVER_11W_SUPPORT=y
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_i2c-tools=y
-CONFIG_PACKAGE_iwinfo=y
-CONFIG_PACKAGE_logrotate=y
-CONFIG_PACKAGE_dnsmasq=n
-CONFIG_PACKAGE_dnsmasq-full=y
-CONFIG_PACKAGE_umdns=y
-CONFIG_PACKAGE_wpad-mini=n
-CONFIG_PACKAGE_wpad=y
-CONFIG_PACKAGE_dropbear=m
-CONFIG_PACKAGE_ppp-mod-pppoa=n
-CONFIG_PACKAGE_node=n
-CONFIG_PACKAGE_haveged=y
-CONFIG_PACKAGE_iw=n
-CONFIG_PACKAGE_iw-full=y
-CONFIG_PACKAGE_ntpdate=y
-CONFIG_PACKAGE_start-indicator=y
-CONFIG_PACKAGE_kmod-ledtrig-heartbeat=y
 
-# Busybox configuration
+# Busybox package and configurations
+CONFIG_PACKAGE_busybox-static=m
+
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_DEFAULT_CROND=n
 CONFIG_BUSYBOX_CONFIG_CRONTAB=n
-- 
GitLab