From eb3fad4bae30ff0c7912d94ffd3c7704cb0bdfe6 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 13 Jun 2021 00:05:56 +0200 Subject: [PATCH 1/3] build: move check_site.lua main script into gluon-core package Installing the script into the image allows site checks to run for manual package installations via opkg. --- .../gluon-core/luasrc/lib/gluon/check-site.lua | 0 package/gluon.mk | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename scripts/check_site.lua => package/gluon-core/luasrc/lib/gluon/check-site.lua (100%) diff --git a/scripts/check_site.lua b/package/gluon-core/luasrc/lib/gluon/check-site.lua similarity index 100% rename from scripts/check_site.lua rename to package/gluon-core/luasrc/lib/gluon/check-site.lua diff --git a/package/gluon.mk b/package/gluon.mk index 5a794476..199ef863 100644 --- a/package/gluon.mk +++ b/package/gluon.mk @@ -21,7 +21,7 @@ shell-verbatim = $(call shell-unescape,$(call shell-escape,$(1))) define GluonCheckSite -[ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" "${TOPDIR}/../scripts/check_site.lua" <<'END__GLUON__CHECK__SITE' +[ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" "$$IPKG_INSTROOT/lib/gluon/check-site.lua" <<'END__GLUON__CHECK__SITE' $(call shell-verbatim,cat '$(1)') END__GLUON__CHECK__SITE endef From 298723c22b0f898ce348d7b2617186f09b0d2534 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 13 Jun 2021 00:55:40 +0200 Subject: [PATCH 2/3] gluon-core: gluon-check-site: do not fail when IPKG_INSTROOT is unset --- package/gluon-core/luasrc/lib/gluon/check-site.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/gluon-core/luasrc/lib/gluon/check-site.lua b/package/gluon-core/luasrc/lib/gluon/check-site.lua index 43765f80..6861d8cb 100644 --- a/package/gluon-core/luasrc/lib/gluon/check-site.lua +++ b/package/gluon-core/luasrc/lib/gluon/check-site.lua @@ -360,7 +360,7 @@ end function M.need_domain_name(path) M.need_string(path) M.need(path, function(domain_name) - local f = io.open(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/domains/' .. domain_name .. '.json') + local f = io.open((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/domains/' .. domain_name .. '.json') if not f then return false end f:close() return true @@ -383,7 +383,7 @@ end local check = setfenv(assert(loadfile()), M) -site = assert(json.load(os.getenv('IPKG_INSTROOT') .. '/lib/gluon/site.json')) +site = assert(json.load((os.getenv('IPKG_INSTROOT') or '') .. '/lib/gluon/site.json')) local ok, err = pcall(function() if has_domains then From 3a2d176df8973e6647bcea805612f13a801108eb Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 13 Jun 2021 00:43:02 +0200 Subject: [PATCH 3/3] build: run site checks for manual package installations --- package/gluon.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package/gluon.mk b/package/gluon.mk index 199ef863..a2aab619 100644 --- a/package/gluon.mk +++ b/package/gluon.mk @@ -21,7 +21,8 @@ shell-verbatim = $(call shell-unescape,$(call shell-escape,$(1))) define GluonCheckSite -[ -z "$$IPKG_INSTROOT" ] || "${TOPDIR}/staging_dir/hostpkg/bin/lua" "$$IPKG_INSTROOT/lib/gluon/check-site.lua" <<'END__GLUON__CHECK__SITE' +[ -z "$$STAGING_DIR_HOSTPKG" ] || PATH="$$STAGING_DIR_HOSTPKG/bin:$$PATH" +lua "$$IPKG_INSTROOT/lib/gluon/check-site.lua" <<'END__GLUON__CHECK__SITE' $(call shell-verbatim,cat '$(1)') END__GLUON__CHECK__SITE endef