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

scripts/target_lib.lua: reorganize images into per-device lists

Browse Source
This commit is contained in:
Matthias Schiffer 2020-04-24 23:09:05 +02:00 committed by David Bauer
parent 8bc602b021
commit e993f22233
3 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/copy_output.lua
View File

@ -36,20 +36,22 @@ local function clean(image, name)
lib.exec {'rm', '-f', dir..'/'..file} lib.exec {'rm', '-f', dir..'/'..file}
end end
for _, image in ipairs(lib.images) do for _, images in pairs(lib.images) do
clean(image, image.image) for _, image in ipairs(images) do
clean(image, image.image)
local destdir, destname = image:dest_name(image.image) local destdir, destname = image:dest_name(image.image)
local source = string.format('openwrt/bin/targets/%s/openwrt-%s-%s%s%s', local source = string.format('openwrt/bin/targets/%s/openwrt-%s-%s%s%s',
bindir, openwrt_target, image.name, image.in_suffix, image.extension) bindir, openwrt_target, image.name, image.in_suffix, image.extension)
lib.exec {'cp', source, destdir..'/'..destname} lib.exec {'cp', source, destdir..'/'..destname}
for _, alias in ipairs(image.aliases) do for _, alias in ipairs(image.aliases) do
clean(image, alias) clean(image, alias)
local _, aliasname = image:dest_name(alias) local _, aliasname = image:dest_name(alias)
lib.exec {'ln', '-s', destname, destdir..'/'..aliasname} lib.exec {'ln', '-s', destname, destdir..'/'..aliasname}
end
end end
end end

8
scripts/generate_manifest.lua
View File

@ -48,8 +48,10 @@ local function generate(image)
end end
end end
for _, image in ipairs(lib.images) do for _, images in pairs(lib.images) do
if image.subdir == 'sysupgrade' then for _, image in ipairs(images) do
generate(image) if image.subdir == 'sysupgrade' then
generate(image)
end
end end
end end

4
scripts/target_lib.lua
View File

@ -143,7 +143,9 @@ local image_mt = {
} }
local function add_image(image) local function add_image(image)
table.insert(M.images, setmetatable(image, image_mt)) local device = image.image
M.images[device] = M.images[device] or {}
table.insert(M.images[device], setmetatable(image, image_mt))
end end
function F.try_config(...) function F.try_config(...)