Skip to content
Snippets Groups Projects
Unverified Commit a01818f6 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

scripts: target_config_lib: remove handling for targets without devices

Another leftover from legacy OpenWrt targets, which we don't support
anymore.
parent 16227efd
No related branches found
No related tags found
No related merge requests found
...@@ -151,49 +151,33 @@ lib.include(target) ...@@ -151,49 +151,33 @@ lib.include(target)
lib.check_devices() lib.check_devices()
if #lib.devices > 0 then handle_target_pkgs(lib.target_packages)
handle_target_pkgs(lib.target_packages)
for _, dev in ipairs(lib.devices) do
local device_pkgs = {}
local function handle_pkgs(pkgs)
for _, pkg in ipairs(pkgs) do
if string.sub(pkg, 1, 1) ~= '-' then
config_package(pkg, nil)
end
device_pkgs = append_to_list(device_pkgs, pkg)
end
end
handle_pkgs(lib.target_packages) for _, dev in ipairs(lib.devices) do
handle_pkgs(class_packages(dev.options.class)) local device_pkgs = {}
handle_pkgs(dev.options.packages or {})
handle_pkgs(site_packages(dev.image))
local profile_config = string.format('%s_DEVICE_%s', openwrt_config_target, dev.name)
lib.config(
'TARGET_DEVICE_' .. profile_config, true,
string.format("unable to enable device '%s'", dev.name)
)
lib.config(
'TARGET_DEVICE_PACKAGES_' .. profile_config,
table.concat(device_pkgs, ' ')
)
end
else
-- x86 fallback: no devices
local target_pkgs = {}
local function handle_pkgs(pkgs) local function handle_pkgs(pkgs)
target_pkgs = concat_list(target_pkgs, pkgs) for _, pkg in ipairs(pkgs) do
if string.sub(pkg, 1, 1) ~= '-' then
config_package(pkg, nil)
end
device_pkgs = append_to_list(device_pkgs, pkg)
end
end end
-- Just hardcode the class for device-less targets to 'standard'
-- - this is x86 only at the moment, and it will have devices
-- in OpenWrt 19.07 + 1 as well
handle_pkgs(lib.target_packages) handle_pkgs(lib.target_packages)
handle_pkgs(class_packages('standard')) handle_pkgs(class_packages(dev.options.class))
handle_pkgs(dev.options.packages or {})
handle_target_pkgs(target_pkgs) handle_pkgs(site_packages(dev.image))
local profile_config = string.format('%s_DEVICE_%s', openwrt_config_target, dev.name)
lib.config(
'TARGET_DEVICE_' .. profile_config, true,
string.format("unable to enable device '%s'", dev.name)
)
lib.config(
'TARGET_DEVICE_PACKAGES_' .. profile_config,
table.concat(device_pkgs, ' ')
)
end end
return lib return lib
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment