Skip to content
Snippets Groups Projects
Commit 1c45dd21 authored by David Bauer's avatar David Bauer
Browse files

image-customization: include file-extension


Include the file-extension with the image-customization.lua file. This
will ease work with editors providing syntax highlighting, as they now
properly detect the file-type.

Signed-off-by: default avatarDavid Bauer <mail@david-bauer.net>
parent 280b4375
No related branches found
No related tags found
No related merge requests found
......@@ -36,11 +36,11 @@ ifneq ($(GLUON_BRANCH),)
endif
ifneq ($(GLUON_FEATURES)$(GLUON_FEATURES_standard)$(GLUON_FEATURES_tiny),)
$(error *** Warning: GLUON_FEATURES has been obsolete, please use the image-customization file instead.)
$(error *** Warning: GLUON_FEATURES has been obsolete, please use the image-customization.lua file instead.)
endif
ifneq ($(GLUON_SITE_PACKAGES)$(GLUON_SITE_PACKAGES_standard)$(GLUON_SITE_PACKAGES_tiny),)
$(error *** Warning: GLUON_SITE_PACKAGES has been obsolete, please use the image-customization file instead.)
$(error *** Warning: GLUON_SITE_PACKAGES has been obsolete, please use the image-customization.lua file instead.)
endif
GLUON_AUTOUPDATER_ENABLED ?= 0
......
......@@ -154,7 +154,7 @@ Feature flags
Feature flags provide a convenient way to define package selections without
making it necessary to list each package explicitly. The list of features to
enable for a Gluon build is determined by the evaluated image-customization file
enable for a Gluon build is determined by the evaluated image-customization.lua file
in the root-directory of the Site repository.
The main feature flag definition file is ``package/features``, but each package
......@@ -208,7 +208,7 @@ Example::
This will
* disable the inclusion of the (non-existent) packages *gluon-web-wizard* and *gluon-no-radvd* when their
corresponding feature flags are evaluated as selected in the image-customization file
corresponding feature flags are evaluated as selected in the image-customization.lua file
* enable four additional config mode packages when the *web-wizard* feature is enabled
* enable *gluon-config-mode-mesh-vpn* when both *web-wizard* and one
of *mesh-vpn-fastd* and *mesh-vpn-tunneldigger* are enabled
......
......@@ -106,7 +106,7 @@ Via config mode
^^^^^^^^^^^^^^^
To allow switching the domain via config mode, add ``config-mode-domain-select``
to the enabled features in the image-customization file.
to the enabled features in the image-customization.lua file.
|image0|
......
......@@ -647,7 +647,7 @@ leading to entangled package names like *gluon-mesh-vpn-fastd-respondd* or
*gluon-status-page-mesh-batman-adv-i18n-de*.
For this reason, we have introduced *feature flags*, which can be specified
in the using the image-customization framework. These flags allow to specify
in the using the image-customization.lua framework. These flags allow to specify
a set of features on a higher level than individual package names.
Most Gluon packages can simply be specified as feature flags by removing the ``gluon-``
......@@ -671,7 +671,7 @@ To some extent, it will even allow us to further modularize existing Gluon packa
without necessitating changes to existing site configurations.
It is still possible to override such automatic rules by removing them using
*packages* in the image-customization file
*packages* in the image-customization.lua file
(e.g., ``features { '-gluon-status-page-mesh-batman-adv' }`` to remove
the automatically added package *gluon-status-page-mesh-batman-adv*).
......
......@@ -10,7 +10,7 @@ local function file_exists(file)
end
local function get_customization_file_name(env)
return env.GLUON_SITEDIR .. '/image-customization'
return env.GLUON_SITEDIR .. '/image-customization.lua'
end
local function evaluate_device(env, dev)
......
......@@ -92,7 +92,7 @@ local function site_specific_packages(dev_info)
local feature_inherited_pkgs
local site_features
-- Get all enabled selections from image-customization
-- Get all enabled selections from image-customization.lua
site_selections = image_customization_lib.get_selections(env, dev_info)
-- First read enabled features from site
......
......@@ -78,7 +78,7 @@ end
local function want_device(device_info)
local overrides = get_device_overrides(device_info)
-- Check if device is disabled via image-customization in site
-- Check if device is disabled via image-customization.lua in site
if overrides['disabled'] then
return false
end
......
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