lists: fix inclusions

Ups this won't work because exports are exported only to lower scripts
not back up so it can't be in separate file.

lists/base-min.lua.m4

 include(utils.m4)dnl Include utility macros
-list_script('repository.lua')
+include(repository.m4)dnl Include Repository command
 
 -- Updater itself
 Install('updater-ng', 'updater-supervisor', { critical = true })

lists/base-netboot.lua.m4

 include(utils.m4)dnl Include utility macros
-list_script('repository.lua')
+include(repository.m4)dnl Include Repository command
+
 list_script('base-min.lua')
 
 _FEATURE_GUARD_

lists/base.lua.m4

 include(utils.m4)dnl Include utility macros
-list_script('repository.lua')
+include(repository.m4)dnl Include Repository command
+
 list_script('base-min.lua')
 
 _FEATURE_GUARD_

lists/repository.lua.m4

 include(utils.m4)dnl Include utility macros
 
-if not turris_repo_included then -- single include guard
-
 local subdirs = { "base", "core" esyscmd(`awk "/^src-git/{printf \", \\\"%s\\\"\", \$'`2}" '_FEEDS_)}
 
 if features["relative_uri"] then
@@ -26,7 +24,3 @@ for _, subdir in ipairs(subdirs) do
 			{ optional = true })
 	end
 end
-
-turris_repo_included = true
-Export('turris_repo_included')
-end

lists/repository.m4

+dnl This is common repository include
+dnl It guards it against multiple inclusion in subscripts.
+if not turris_repo_included then
+	list_script("repository.lua")
+	turris_repo_included = true
+	Export('turris_repo_included')
+end

lists/utils.lua

-if not turris_utils_included then -- Multiple inclusions guard
-
-if not board then
-	model = model or os_release["LEDE_DEVICE_PRODUCT"]
-	if model:match("[Mm]ox") then
-		board = "mox"
-	elseif model:match("[Oo]mnia") then
-		board = "omnia"
-	elseif model:match("^[Tt]urris$") then
-		board = "turris1x"
-	else
-		DIE("Unsupported Turris model: " .. tostring(model))
-	end
-	Export('board')
-end
-
-turris_utils_included = true
-Export('turris_utils_included')
-end

lists/utils.m4

@@ -53,5 +53,17 @@ function list_script(list)
 		Script((repo_base_uri or "https://repo.turris.cz/hbs") .. "/lists/" .. list)
 	end
 end
-list_script("utils.lua")
+
+if not board then
+	local model = model or os_release["LEDE_DEVICE_PRODUCT"]
+	if model:match("[Mm]ox") then
+		board = "mox"
+	elseif model:match("[Oo]mnia") then
+		board = "omnia"
+	elseif model:match("^[Tt]urris$") then
+		board = "turris1x"
+	else
+		DIE("Unsupported Turris model: " .. tostring(model))
+	end
+end
 ----------------------------------------------------------------------------------