Skip to content
Snippets Groups Projects
Verified Commit ec0d2618 authored by Karel Koci's avatar Karel Koci :metal:
Browse files

lists: drop problematic soft dependency for Foris languages

This code was causing problems with packages not being removed because
they were held on place by localization package. This reverts it to a
approach where we specify language packages only if we add request for
package it self.
parent e0a701c0
Branches
Tags
1 merge request!123Turris OS 5.0 (HBK)
local function foris_plugin(...)
for plugin in pairs(...) do
fplugin = "foris-" .. plugin .. "-plugin"
Install(fplugin, { priority = 40 })
if for_l10n then
for_l10n(fplugin .. "-l10n-")
end
end
end
include(utils.m4)dnl Include utility macros
include(foris-utils.m4)dnl
_FEATURE_GUARD_
Install("foris", "foris-diagnostics-plugin", "foris-storage-plugin", "lighttpd-https-cert", { priority = 40 })
--[[
All foris plugins
Generated using:
curl https://repo.turris.cz/hbd/omnia/packages/turrispackages/Packages | sed -n 's/^Package: foris-\([^-]\+\)-plugin.*/\1/p' | sort | uniq | sed 's/^/"/;s/$/",/'
]]
local foris_plugins = {
"data_collect",
"diagnostics",
"netmetr",
"openvpn",
"pakon",
"ssbackups",
"storage",
"subordinates",
}
Install("foris" { priority = 40 })
if for_l10n then
for_l10n("foris-l10n-")
for_l10n('pkglists-l10n-')
for _, plugin in pairs(foris_plugins) do
local fplugin = "foris-" .. plugin .. "-plugin"
if installed[fplugin] then
for_l10n(fplugin .. "-l10n-")
else
--[[
We are not aware that we should install l10n unless it is installed
already so we instead request replan on finish to install missing l10n
packages.
]]
Package(fplugin, { replan = "finished"})
end
end
end
foris_plugin("diagnostics", "storage")
Install("lighttpd-https-cert", { priority = 40 })
_END_FEATURE_GUARD_
include(utils.m4)dnl Include utility macros
include(foris-utils.m4)dnl
_FEATURE_GUARD_
Install("foris-subordinates-plugin", { priority = 40 })
foris_plugin("subordinates")
_END_FEATURE_GUARD_
include(utils.m4)dnl Include utility macros
include(foris-utils.m4)dnl
_FEATURE_GUARD_
Install("foris-netmetr-plugin", { priority = 40 })
foris_plugin("netmetr")
_END_FEATURE_GUARD_
include(utils.m4)dnl Include utility macros
include(foris-utils.m4)dnl
_FEATURE_GUARD_
Install("foris-openvpn-plugin","openvpn-openssl", "dhparam", { priority = 40 })
foris_plugin("openvpn")
Install("openvpn-openssl", "dhparam", { priority = 40 })
_END_FEATURE_GUARD_
include(utils.m4)dnl Include utility macros
include(foris-utils.m4)dnl
_FEATURE_GUARD_
Install("foris-pakon-plugin", "pakon", "pakon-lists", "suricata-pakon", { priority = 40 })
foris_plugin("pakon")
Install("pakon", "pakon-lists", "suricata-pakon", { priority = 40 })
_END_FEATURE_GUARD_
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment