target_lib: replace envtrue with more intuitive istrue helper

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
This commit is contained in:
Matthias Schiffer 2020-03-14 16:51:43 +01:00
parent c9f3017ac5
commit d7e724ada9
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
3 changed files with 8 additions and 9 deletions

View File

@ -89,13 +89,13 @@ files["targets/*"] = {
"defaults", "defaults",
"device", "device",
"env", "env",
"envtrue",
"exec", "exec",
"exec_capture", "exec_capture",
"exec_capture_raw", "exec_capture_raw",
"exec_raw", "exec_raw",
"factory_image", "factory_image",
"include", "include",
"istrue",
"no_opkg", "no_opkg",
"packages", "packages",
"sysupgrade_image", "sysupgrade_image",

View File

@ -15,11 +15,6 @@ local env = setmetatable({}, {
}) })
F.env = env F.env = env
local envtrue = setmetatable({}, {
__index = function(_, k) return (tonumber(os.getenv(k)) or 0) > 0 end
})
F.envtrue = envtrue
assert(env.GLUON_SITEDIR) assert(env.GLUON_SITEDIR)
assert(env.GLUON_TARGETSDIR) assert(env.GLUON_TARGETSDIR)
assert(env.GLUON_RELEASE) assert(env.GLUON_RELEASE)
@ -55,8 +50,12 @@ for dev in string.gmatch(env.GLUON_DEVICES or '', '%S+') do
unknown_devices[dev] = true unknown_devices[dev] = true
end end
function F.istrue(v)
return (tonumber(v) or 0) > 0
end
local function want_device(dev, options) local function want_device(dev, options)
if options.broken and not envtrue.BROKEN then if options.broken and not F.istrue(env.BROKEN) then
return false return false
end end
if options.deprecated and env.GLUON_DEPRECATED == '0' then if options.deprecated and env.GLUON_DEPRECATED == '0' then

View File

@ -47,11 +47,11 @@ config '# CONFIG_KERNEL_IPV6_MROUTE is not set'
try_config 'CONFIG_TARGET_MULTI_PROFILE=y' try_config 'CONFIG_TARGET_MULTI_PROFILE=y'
try_config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y' try_config 'CONFIG_TARGET_PER_DEVICE_ROOTFS=y'
if envtrue.GLUON_MULTIDOMAIN then if istrue(env.GLUON_MULTIDOMAIN) then
config 'CONFIG_GLUON_MULTIDOMAIN=y' config 'CONFIG_GLUON_MULTIDOMAIN=y'
end end
if envtrue.GLUON_DEBUG then if istrue(env.GLUON_DEBUG) then
config 'CONFIG_DEBUG=y' config 'CONFIG_DEBUG=y'
config 'CONFIG_NO_STRIP=y' config 'CONFIG_NO_STRIP=y'
config '# CONFIG_USE_STRIP is not set' config '# CONFIG_USE_STRIP is not set'