53690d83be
The precedence of different package lists was broken since #1876, disallowing removal of GLUON_FEATURES packages via GLUON_SITE_PACKAGES. Including all package selections, both implicit defaults and explicit handling in Gluon, the order of precedence is now the following: 1. OpenWrt defaults (including target-specific defaults) 2. Device-specific packages from OpenWrt 3. Generic default packages (from target/generic) 4. Target default packages (target/$(GLUON_TARGET)) 5. Removal of opkg for tiny targets 6. Packages derived from GLUON_FEATURES + GLUON_FEATURES_$(class) 7. GLUON_SITE_PACKAGES 8. GLUON_SITE_PACKAGES_$(class) 9. Device-specific packages from target/$(GLUON_TARGET) 10. Device-specific packages from GLUON_$(device)_SITE_PACKAGES This also contains various pieces of cleanup: - No hardcoded order of device classes for target_config.lua arguments anymore (in fact, the Makefile doesn't know anything about device classes now) - target_conifg_lib.lua only hardcodes the fallback class for x86, no other occurences of specific class names - Feature -> package list mapping is moved from Makefile to the Lua code as well (still implemented in Shell though)
173 lines
4.4 KiB
Lua
173 lines
4.4 KiB
Lua
-- Split a string into words
|
|
local function split(s)
|
|
local ret = {}
|
|
for w in string.gmatch(s, '%S+') do
|
|
table.insert(ret, w)
|
|
end
|
|
return ret
|
|
end
|
|
|
|
-- Strip leading '-' character
|
|
local function strip_neg(s)
|
|
if string.sub(s, 1, 1) == '-' then
|
|
return string.sub(s, 2)
|
|
else
|
|
return s
|
|
end
|
|
end
|
|
|
|
-- Add an element to a list, removing duplicate entries and handling negative
|
|
-- elements prefixed with a '-'
|
|
local function append_to_list(list, item, keep_neg)
|
|
local match = strip_neg(item)
|
|
local ret = {}
|
|
for _, el in ipairs(list) do
|
|
if strip_neg(el) ~= match then
|
|
table.insert(ret, el)
|
|
end
|
|
end
|
|
if keep_neg ~= false or string.sub(item, 1, 1) ~= '-' then
|
|
table.insert(ret, item)
|
|
end
|
|
return ret
|
|
end
|
|
|
|
local function compact_list(list, keep_neg)
|
|
local ret = {}
|
|
for _, el in ipairs(list) do
|
|
ret = append_to_list(ret, el, keep_neg)
|
|
end
|
|
return ret
|
|
end
|
|
|
|
return function(funcs)
|
|
local lib = dofile('scripts/target_lib.lua')
|
|
local env = lib.env
|
|
|
|
local target = env.GLUON_TARGET
|
|
|
|
assert(target)
|
|
assert(env.BOARD)
|
|
assert(env.SUBTARGET)
|
|
|
|
local openwrt_config_target
|
|
if env.SUBTARGET ~= '' then
|
|
openwrt_config_target = env.BOARD .. '_' .. env.SUBTARGET
|
|
else
|
|
openwrt_config_target = env.BOARD
|
|
end
|
|
|
|
|
|
local function site_vars(var)
|
|
return lib.exec_capture_raw(string.format([[
|
|
MAKEFLAGS= make print _GLUON_SITE_VARS_=%s --no-print-directory -s -f - <<'END_MAKE'
|
|
include $(GLUON_SITEDIR)/site.mk
|
|
|
|
print:
|
|
echo -n '$(_GLUON_SITE_VARS_)'
|
|
END_MAKE
|
|
]], lib.escape(var)))
|
|
end
|
|
|
|
local function site_packages(image)
|
|
return split(site_vars(string.format('$(GLUON_%s_SITE_PACKAGES)', image)))
|
|
end
|
|
|
|
-- TODO: Rewrite features.sh in Lua
|
|
local function feature_packages(features)
|
|
-- Ugly hack: Lua doesn't give us the return code of a popened
|
|
-- command, so we match on a special __ERROR__ marker
|
|
local pkgs = lib.exec_capture({'scripts/features.sh', features}, '|| echo __ERROR__')
|
|
assert(string.find(pkgs, '__ERROR__') == nil, 'Error while evaluating features')
|
|
return pkgs
|
|
end
|
|
|
|
-- This involves running lots of processes to evaluate site.mk, so we
|
|
-- add a simple cache
|
|
local class_cache = {}
|
|
local function class_packages(class)
|
|
if class_cache[class] then
|
|
return class_cache[class]
|
|
end
|
|
|
|
local features = site_vars(string.format('$(GLUON_FEATURES) $(GLUON_FEATURES_%s)', class))
|
|
features = table.concat(compact_list(split(features), false), ' ')
|
|
|
|
local pkgs = feature_packages(features)
|
|
pkgs = pkgs .. ' ' .. site_vars(string.format('$(GLUON_SITE_PACKAGES) $(GLUON_SITE_PACKAGES_%s)', class))
|
|
|
|
pkgs = compact_list(split(pkgs))
|
|
|
|
class_cache[class] = pkgs
|
|
return pkgs
|
|
end
|
|
|
|
local function handle_target_pkgs(pkgs)
|
|
for _, pkg in ipairs(pkgs) do
|
|
if string.sub(pkg, 1, 1) == '-' then
|
|
lib.try_config('# CONFIG_PACKAGE_%s is not set', string.sub(pkg, 2))
|
|
else
|
|
funcs.config_package(lib.config, pkg, 'y')
|
|
end
|
|
end
|
|
end
|
|
|
|
lib.include('generic')
|
|
lib.include(target)
|
|
|
|
lib.check_devices()
|
|
|
|
if not lib.opkg then
|
|
lib.config '# CONFIG_SIGNED_PACKAGES is not set'
|
|
lib.config 'CONFIG_CLEAN_IPKG=y'
|
|
lib.packages {'-opkg'}
|
|
end
|
|
|
|
if #lib.devices > 0 then
|
|
handle_target_pkgs(lib.target_packages)
|
|
|
|
for _, dev in ipairs(lib.devices) do
|
|
local profile = dev.options.profile or dev.name
|
|
|
|
local device_pkgs = {}
|
|
local function handle_pkgs(pkgs)
|
|
for _, pkg in ipairs(pkgs) do
|
|
if string.sub(pkg, 1, 1) ~= '-' then
|
|
funcs.config_package(lib.config, pkg, 'm')
|
|
end
|
|
device_pkgs = append_to_list(device_pkgs, pkg)
|
|
end
|
|
end
|
|
|
|
handle_pkgs(lib.target_packages)
|
|
handle_pkgs(class_packages(dev.options.class))
|
|
handle_pkgs(dev.options.packages or {})
|
|
handle_pkgs(site_packages(dev.image))
|
|
|
|
funcs.config_message(lib.config, string.format("unable to enable device '%s'", profile),
|
|
'CONFIG_TARGET_DEVICE_%s_DEVICE_%s=y', openwrt_config_target, profile)
|
|
lib.config('CONFIG_TARGET_DEVICE_PACKAGES_%s_DEVICE_%s="%s"',
|
|
openwrt_config_target, profile,
|
|
table.concat(device_pkgs, ' '))
|
|
end
|
|
else
|
|
-- x86 fallback: no devices
|
|
local target_pkgs = {}
|
|
local function handle_pkgs(pkgs)
|
|
for _, pkg in ipairs(pkgs) do
|
|
target_pkgs = append_to_list(target_pkgs, pkg)
|
|
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(class_packages('standard'))
|
|
|
|
handle_target_pkgs(target_pkgs)
|
|
end
|
|
|
|
return lib
|
|
end
|