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

copy_output: copy imagebuilder to output dir

Browse Source
This commit is contained in:
lemoer 2021-01-07 04:45:57 +01:00
parent d9cb59fcc6
commit 7d594f4a99
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -39,6 +39,7 @@ GLUON_AUTOUPDATER_ENABLED ?= 0
# initialize (possibly already user set) directory variables # initialize (possibly already user set) directory variables
GLUON_TMPDIR ?= tmp GLUON_TMPDIR ?= tmp
GLUON_OUTPUTDIR ?= output GLUON_OUTPUTDIR ?= output
GLUON_IMAGEBUILDERDIR ?= $(GLUON_OUTPUTDIR)/imagebuilder
GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages
GLUON_DEBUGDIR ?= $(GLUON_OUTPUTDIR)/debug GLUON_DEBUGDIR ?= $(GLUON_OUTPUTDIR)/debug
@ -47,6 +48,7 @@ GLUON_PATCHESDIR ?= patches
$(eval $(call mkabspath,GLUON_TMPDIR)) $(eval $(call mkabspath,GLUON_TMPDIR))
$(eval $(call mkabspath,GLUON_OUTPUTDIR)) $(eval $(call mkabspath,GLUON_OUTPUTDIR))
$(eval $(call mkabspath,GLUON_IMAGEBUILDERDIR))
$(eval $(call mkabspath,GLUON_IMAGEDIR)) $(eval $(call mkabspath,GLUON_IMAGEDIR))
$(eval $(call mkabspath,GLUON_PACKAGEDIR)) $(eval $(call mkabspath,GLUON_PACKAGEDIR))
$(eval $(call mkabspath,GLUON_TARGETSDIR)) $(eval $(call mkabspath,GLUON_TARGETSDIR))
@ -65,9 +67,9 @@ endef
GLUON_VARS = \ GLUON_VARS = \
GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_AUTOREMOVE GLUON_DEBUG GLUON_MINIFY GLUON_DEPRECATED \ GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_AUTOREMOVE GLUON_DEBUG GLUON_MINIFY GLUON_DEPRECATED \
GLUON_DEVICES GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR GLUON_DEBUGDIR \ GLUON_DEVICES GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEBUILDERDIR GLUON_IMAGEDIR \
GLUON_SITEDIR GLUON_RELEASE GLUON_AUTOUPDATER_BRANCH GLUON_AUTOUPDATER_ENABLED GLUON_LANGS GLUON_BASE_FEEDS \ GLUON_PACKAGEDIR GLUON_DEBUGDIR GLUON_SITEDIR GLUON_RELEASE GLUON_AUTOUPDATER_BRANCH GLUON_AUTOUPDATER_ENABLED \
GLUON_TARGET BOARD SUBTARGET GLUON_LANGS GLUON_BASE_FEEDS GLUON_TARGET BOARD SUBTARGET
unexport $(GLUON_VARS) unexport $(GLUON_VARS)
GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var)))) GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))

18
scripts/copy_output.lua
View File

@ -4,6 +4,7 @@ local env = lib.env
local target = env.GLUON_TARGET local target = env.GLUON_TARGET
assert(target) assert(target)
assert(env.GLUON_IMAGEBUILDERDIR)
assert(env.GLUON_IMAGEDIR) assert(env.GLUON_IMAGEDIR)
assert(env.GLUON_PACKAGEDIR) assert(env.GLUON_PACKAGEDIR)
@ -27,6 +28,7 @@ end
mkdir(env.GLUON_IMAGEDIR..'/factory') mkdir(env.GLUON_IMAGEDIR..'/factory')
mkdir(env.GLUON_IMAGEDIR..'/sysupgrade') mkdir(env.GLUON_IMAGEDIR..'/sysupgrade')
mkdir(env.GLUON_IMAGEDIR..'/other') mkdir(env.GLUON_IMAGEDIR..'/other')
mkdir(env.GLUON_IMAGEBUILDERDIR)
mkdir(env.GLUON_DEBUGDIR) mkdir(env.GLUON_DEBUGDIR)
@ -82,6 +84,22 @@ local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst'
lib.exec {'cp', kernel_debug_source, kernel_debug_dest} lib.exec {'cp', kernel_debug_source, kernel_debug_dest}
-- copy imagebuilder
local imagebuilder_glob = string.format('%s/gluon-\0-imagebuilder-%s.tar.xz',
env.GLUON_IMAGEBUILDERDIR,
target)
lib.exec {'rm', '-f', imagebuilder_glob}
local imagebuilder_source = string.format('openwrt/bin/targets/%s/openwrt-imagebuilder-%s.Linux-x86_64.tar.xz',
bindir,
target)
local imagebuilder_dest = string.format('%s/gluon-%s-%s-imagebuilder-%s.tar.xz',
env.GLUON_IMAGEBUILDERDIR,
lib.site_code,
env.GLUON_RELEASE,
target)
lib.exec {'cp', imagebuilder_source, imagebuilder_dest}
-- Copy opkg repo -- Copy opkg repo
if (env.GLUON_DEVICES or '') == '' then if (env.GLUON_DEVICES or '') == '' then
local package_prefix = string.format('gluon-%s-%s', lib.site_code, env.GLUON_RELEASE) local package_prefix = string.format('gluon-%s-%s', lib.site_code, env.GLUON_RELEASE)