From d7e724ada979f9992d538fd716f7bdb198cf29b7 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 14 Mar 2020 16:51:43 +0100
Subject: [PATCH] target_lib: replace envtrue with more intuitive istrue helper

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 .luacheckrc            |  2 +-
 scripts/target_lib.lua | 11 +++++------
 targets/generic        |  4 ++--
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.luacheckrc b/.luacheckrc
index b9ee54c0..36299c6d 100644
--- a/.luacheckrc
+++ b/.luacheckrc
@@ -89,13 +89,13 @@ files["targets/*"] = {
 		"defaults",
 		"device",
 		"env",
-		"envtrue",
 		"exec",
 		"exec_capture",
 		"exec_capture_raw",
 		"exec_raw",
 		"factory_image",
 		"include",
+		"istrue",
 		"no_opkg",
 		"packages",
 		"sysupgrade_image",
diff --git a/scripts/target_lib.lua b/scripts/target_lib.lua
index d5133b1e..f3e372b5 100644
--- a/scripts/target_lib.lua
+++ b/scripts/target_lib.lua
@@ -15,11 +15,6 @@ local env = setmetatable({}, {
 })
 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_TARGETSDIR)
 assert(env.GLUON_RELEASE)
@@ -55,8 +50,12 @@ for dev in string.gmatch(env.GLUON_DEVICES or '', '%S+') do
 	unknown_devices[dev] = true
 end
 
+function F.istrue(v)
+	return (tonumber(v) or 0) > 0
+end
+
 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
 	end
 	if options.deprecated and env.GLUON_DEPRECATED == '0' then
diff --git a/targets/generic b/targets/generic
index 65982ef4..fc4ed0ea 100644
--- a/targets/generic
+++ b/targets/generic
@@ -47,11 +47,11 @@ config '# CONFIG_KERNEL_IPV6_MROUTE is not set'
 try_config 'CONFIG_TARGET_MULTI_PROFILE=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'
 end
 
-if envtrue.GLUON_DEBUG then
+if istrue(env.GLUON_DEBUG) then
 	config 'CONFIG_DEBUG=y'
 	config 'CONFIG_NO_STRIP=y'
 	config '# CONFIG_USE_STRIP is not set'