lists: split base list

lists/base-min.lua.m4

+include(utils.m4)dnl Include utility macros
+include(repository.m4)dnl Include Repository command
+-- Updater itself
+Install('updater-ng', 'updater-ng-supervisor', { critical = true })
+Package('updater-ng', { replan = 'finished' })
+Package('l10n_supported', { replan = 'finished' })
+
+
+-- Critical minimum
+Install("base-files", "busybox", { critical = true })
+Package("kernel", { reboot = "delayed" })
+Package("kmod-mac80211", { reboot = "delayed" })
+forInstallCritical(kmod,file2args(kmod.list))
+if model:match("[Mm][Oo][Xx]") then
+	forInstallCritical(kmod,file2args(kmod-mox.list))
+elseif model:match("[Oo]mnia") then
+	forInstallCritical(kmod,file2args(kmod-omnia.list))
+elseif model:match("^[Tt]urris$") then
+	forInstallCritical(kmod,file2args(kmod-turris.list))
+end
+Install("fstools", { critical = true })
+if model:match("^[Tt]urris$") then
+	Install("turris-support", { critical = true })
+end
+if model:match("[Oo]mnia") then
+	Install("omnia-support", "btrfs-progs", { critical = true })
+elseif model:match("[Mm][Oo][Xx]") then
+	Install("mox-support", { critical = true })
+end
+Install("dns-resolver", { critical = true })
+
+-- OpenWRT minimum
+Install("procd", "ubus", "uci", "netifd", "firewall", { critical = true})
+Install("ebtables", "odhcpd", "odhcp6c", "rpcd", "opkg", "wget", { priority = 40 })
+if model:match("^[Tt]urris$") then
+	Install("swconfig", { critical = true })
+end
+
+-- Turris minimum
+Install("vixie-cron", "syslog-ng", { priority = 40 })
+Install("logrotate", { priority = 40 })
+Install("dnsmasq-full", { priority = 40 })
+-- Note: Following packages should be critical only if we ignored dns-resolver
+if model:match("^[Tt]urris$") then
+	Install("unbound", "unbound-anchor", { priority = 40 })
+else
+	Install("knot-resolver", { priority = 40 })
+end
+Install("ppp", "ppp-mod-pppoe", { priority = 40 })
+
+-- Certificates
+Install("dnssec-rootkey", "cznic-cacert-bundle", "cznic-repo-keys", "cznic-repo-keys-test", { critical = true })
+-- Note: We don't ensure safety of these CAs
+Install("ca-certificates", { priority = 40 })
+
+_FEATURE_GUARD_
+
+-- Updater utility
+Install("updater-ng-opkg", { priority = 40 })
+Package('updater-ng-opkg', { replan = 'finished' })
+Package('updater-ng-localrepo', { replan = 'finished' })
+Package('switch-branch', { priority = 40 })
+
+-- Utility
+Install("ip-full", "iptables", "ip6tables", { priority = 40 })
+Install("iputils-ping", "iputils-ping6", "iputils-tracepath", "iputils-tracepath6", "iputils-traceroute6", { priority = 40 })
+Install("shadow", "shadow-utils", "uboot-envtools", "i2c-tools", { priority = 40 })
+Install("openssh-client", "openssh-client-utils", "openssh-moduli", "openssh-server", "openssh-sftp-client", "openssh-sftp-server", "openssl-util", { priority = 40 })
+Uninstall("dropbear", { priority = 40 })
+Install("bind-client", "bind-dig", { priority = 40 })
+Install("pciutils", "usbutils", "lsof", { priority = 40 })
+Install("lm-sensors", { priority = 40 })
+Install("haveged", { priority = 40 })
+Install("umdns", { priority = 40 })
+
+-- Turris utility
+Install("turris-utils", "user-notify", "oneshot", "libatsha204", "watchdog_adjust", "update_mac", { priority = 40 })
+if for_l10n then
+	for_l10n("user-notify-l10n-")
+end
+if model:match("[Oo]mnia") then
+	Install("rainbow-omnia", "sfpswitch", { priority = 40 })
+elseif model:match("^[Mm][Oo][Xx]$") then
+	Install("zram-swap", "kmod-gpio-button-hotplug", "kmod-mwifiex-sdio", "kmod-ledtrig-heartbeat", { priority = 40 })
+elseif model:match("^[Tt]urris$") then
+	Install("rainbow", { priority = 40 })
+end
+if not model:match("^[Tt]urris$") then
+	Install("schnapps", { priority = 40 })
+end
+
+Install("turris-version", "start-indicator", { priority = 40 })
+Install("conntrack", { priority = 40 })
+
+-- Wifi
+Install("hostapd-common", "wireless-tools", "wpad", "iw", "iwinfo", { priority = 40 })
+Install("ath10k-firmware-qca988x", { priority = 40 })
+if model:match("[Mm][Oo][Xx]") then
+	Install("mwifiex-sdio-firmware", { priority = 40 })
+end
+
+_END_FEATURE_GUARD_

lists/base.lua.m4

-include(utils.m4)dnl Include utility macros
-include(repository.m4)dnl Include Repository command
--- Updater itself
-Install('updater-ng', 'updater-ng-supervisor', { critical = true })
-Package('updater-ng', { replan = 'finished' })
-Package('l10n_supported', { replan = 'finished' })
-
-
--- Critical minimum
-Install("base-files", "busybox", { critical = true })
-Package("kernel", { reboot = "delayed" })
-Package("kmod-mac80211", { reboot = "delayed" })
-forInstallCritical(kmod,file2args(kmod.list))
-if model:match("[Mm][Oo][Xx]") then
-	forInstallCritical(kmod,file2args(kmod-mox.list))
-elseif model:match("[Oo]mnia") then
-	forInstallCritical(kmod,file2args(kmod-omnia.list))
-elseif model:match("^[Tt]urris$") then
-	forInstallCritical(kmod,file2args(kmod-turris.list))
-end
-Install("fstools", { critical = true })
-if model:match("^[Tt]urris$") then
-	Install("turris-support", { critical = true })
-end
-if model:match("[Oo]mnia") then
-	Install("omnia-support", "btrfs-progs", { critical = true })
-elseif model:match("[Mm][Oo][Xx]") then
-	Install("mox-support", { critical = true })
-end
-Install("dns-resolver", { critical = true })
-
--- OpenWRT minimum
-Install("procd", "ubus", "uci", "netifd", "firewall", { critical = true})
-Install("ebtables", "odhcpd", "odhcp6c", "rpcd", "opkg", "wget", { priority = 40 })
-if model:match("^[Tt]urris$") then
-	Install("swconfig", { critical = true })
-end
-
--- Turris minimum
-Install("vixie-cron", "syslog-ng", { priority = 40 })
-Install("logrotate", { priority = 40 })
-Install("dnsmasq-full", { priority = 40 })
--- Note: Following packages should be critical only if we ignored dns-resolver
-if model:match("^[Tt]urris$") then
-	Install("unbound", "unbound-anchor", { priority = 40 })
-else
-	Install("knot-resolver", { priority = 40 })
-end
-Install("ppp", "ppp-mod-pppoe", { priority = 40 })
-
--- Certificates
-Install("dnssec-rootkey", "cznic-cacert-bundle", "cznic-repo-keys", "cznic-repo-keys-test", { critical = true })
--- Note: We don't ensure safety of these CAs
-Install("ca-certificates", { priority = 40 })
+include(base-min.lua.m4)
 
 _FEATURE_GUARD_
 
--- Updater utility
-Install("updater-ng-opkg", { priority = 40 })
-Package('updater-ng-opkg', { replan = 'finished' })
-Package('updater-ng-localrepo', { replan = 'finished' })
-Package('switch-branch', { priority = 40 })
-
--- Utility
-Install("ip-full", "iptables", "ip6tables", { priority = 40 })
-Install("iputils-ping", "iputils-ping6", "iputils-tracepath", "iputils-tracepath6", "iputils-traceroute6", { priority = 40 })
-Install("shadow", "shadow-utils", "uboot-envtools", "i2c-tools", { priority = 40 })
-Install("openssh-client", "openssh-client-utils", "openssh-moduli", "openssh-server", "openssh-sftp-client", "openssh-sftp-server", "openssl-util", { priority = 40 })
-Uninstall("dropbear", { priority = 40 })
-Install("bind-client", "bind-dig", { priority = 40 })
-Install("pciutils", "usbutils", "lsof", { priority = 40 })
-Install("lm-sensors", { priority = 40 })
-Install("haveged", { priority = 40 })
-Install("umdns", { priority = 40 })
-
--- Turris utility
-Install("turris-utils", "user-notify", "oneshot", "libatsha204", "watchdog_adjust", "update_mac", { priority = 40 })
-if for_l10n then
-	for_l10n("user-notify-l10n-")
-end
-if model:match("[Oo]mnia") then
-	Install("rainbow-omnia", "sfpswitch", { priority = 40 })
-elseif model:match("^[Mm][Oo][Xx]$") then
-	Install("zram-swap", "kmod-gpio-button-hotplug", "kmod-mwifiex-sdio", "kmod-ledtrig-heartbeat", { priority = 40 })
-elseif model:match("^[Tt]urris$") then
-	Install("rainbow", { priority = 40 })
-end
-if not model:match("^[Tt]urris$") then
-	Install("schnapps", { priority = 40 })
-end
-
-Install("foris", "foris-diagnostics-plugin", "turris-webapps", { priority = 40 })
-Install('userlists', { priority = 40 })
-if for_l10n then
-	for_l10n("foris-l10n-")
-	for_l10n("foris-diagnostics-plugin-l10n-")
-	for_l10n('userlists-l10n-')
-end
-Install("turris-version", "lighttpd-https-cert", "start-indicator", { priority = 40 })
-Install("conntrack", { priority = 40 })
-
--- Wifi
-Install("hostapd-common", "wireless-tools", "wpad", "iw", "iwinfo", { priority = 40 })
-Install("ath10k-firmware-qca988x", { priority = 40 })
-if model:match("[Mm][Oo][Xx]") then
-	Install("mwifiex-sdio-firmware", { priority = 40 })
-end
-
--- Terminal tools
-Install("bash", "coreutils", "diffutils", "htop", "curl", "vim-full", "terminfo", "psmisc", { priority = 40 })
-
--- Luci
-Install("luci", "luci-lighttpd", { priority = 40 })
-forInstall(luci,base,proto-ipv6,proto-ppp,app-commands)
-_LUCI_I18N_(base, commands)
+include(luci.lua.m4)
+include(foris.lua)
+include(terminal-apps.lua)
 
 _END_FEATURE_GUARD_
 

lists/foris.lua

+_FEATURE_GUARD_
+
+Install("foris", "foris-diagnostics-plugin", "turris-webapps", "lighttpd-https-cert", { priority = 40 })
+Install('userlists', { priority = 40 })
+if for_l10n then
+	for_l10n("foris-l10n-")
+	for_l10n("foris-diagnostics-plugin-l10n-")
+	for_l10n('userlists-l10n-')
+end
+
+_END_FEATURE_GUARD_

lists/luci.lua.m4

+-- Luci
+Install("luci", "luci-lighttpd", { priority = 40 })
+forInstall(luci,base,proto-ipv6,proto-ppp,app-commands)
+_LUCI_I18N_(base, commands)
+

lists/terminal-apps.lua

+-- Terminal tools
+Install("bash", "coreutils", "diffutils", "htop", "curl", "vim-full", "terminfo", "psmisc", "procps-ng-top", "procps-ng-ps", { priority = 40 })
+