nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: target_config_lib: add aliases for virtual default packages

Browse Source 
OpenWrt's default package list contains the package "nftables", which is
a virtual package provided by "nftables-json" and "nftables-nojson".
Explicitly handle this case, otherwise our config check will fail when
we extend our default package list with the one from OpenWrt.
This commit is contained in:
Matthias Schiffer 2022-08-23 22:53:45 +02:00
parent a01818f6d2
commit ca21952737
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/target_config_lib.lua
View File

@ -123,6 +123,14 @@ local enabled_packages = {}
-- Arguments: package name and config value (true: y, nil: m, false: unset) -- Arguments: package name and config value (true: y, nil: m, false: unset)
-- Ensures precedence of y > m > unset -- Ensures precedence of y > m > unset
local function config_package(pkg, v) local function config_package(pkg, v)
-- HACK: Handle virtual default packages
local subst = {
nftables = 'nftables-nojson'
}
if subst[pkg] then
pkg = subst[pkg]
end
if v == false then if v == false then
if not enabled_packages[pkg] then if not enabled_packages[pkg] then
lib.try_config('PACKAGE_' .. pkg, false) lib.try_config('PACKAGE_' .. pkg, false)