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

209 lines
4.9 KiB
Makefile
Raw Normal View History

Use nice OpenWRT make output
2013-02-17 15:30:59 +00:00
all:
LC_ALL:=C
LANG:=C
export LC_ALL LANG
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
.SHELLFLAGS = -ec
build: allow passing relative paths Allow using relative paths for GLUON_SITEDIR, GLUON_OUTPUTDIR, ... We also check for whitespace in paths now, as build will not work properly with whitespace anyways, and Make's abspath would require escaping otherwise. [Matthias Schiffer: minor changes, rewrite commit message]
2017-11-28 20:29:56 +00:00
# check for spaces & resolve possibly relative paths
define mkabspath
build: indent non-recipe Makefile lines with two spaces
2020-03-07 13:05:58 +00:00
ifneq (1,$(words [$($(1))]))
$$(error $(1) must not contain spaces)
endif
override $(1) := $(abspath $($(1)))
build: allow passing relative paths Allow using relative paths for GLUON_SITEDIR, GLUON_OUTPUTDIR, ... We also check for whitespace in paths now, as build will not work properly with whitespace anyways, and Make's abspath would require escaping otherwise. [Matthias Schiffer: minor changes, rewrite commit message]
2017-11-28 20:29:56 +00:00
endef
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
escape = '$(subst ','\'',$(1))'
build: replace hardcoded paths with overridable variables Signed-off-by: Petr Štetiar <ynezz@true.cz>
2018-10-23 15:48:22 +00:00
GLUON_SITEDIR ?= site
build: allow passing relative paths Allow using relative paths for GLUON_SITEDIR, GLUON_OUTPUTDIR, ... We also check for whitespace in paths now, as build will not work properly with whitespace anyways, and Make's abspath would require escaping otherwise. [Matthias Schiffer: minor changes, rewrite commit message]
2017-11-28 20:29:56 +00:00
$(eval $(call mkabspath,GLUON_SITEDIR))
Use nice OpenWRT make output
2013-02-17 15:30:59 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
$(GLUON_SITEDIR)/site.mk:
$(error No site configuration was found. Please check out a site configuration to $(GLUON_SITEDIR))
Basic build system
2013-02-11 03:52:16 +00:00
build: fix error message in case of missing site repository
2017-02-22 21:40:36 +00:00
include $(GLUON_SITEDIR)/site.mk
Basic build system
2013-02-11 03:52:16 +00:00
build: fix error message in case of missing site repository
2017-02-22 21:40:36 +00:00
GLUON_RELEASE ?= $(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line)
Add GLUON_DEPRECATED flag This new build flag is mandatory for now (it may default to 0 in a future Gluon version). It may be set to the following values: * 0 - Do not build any images for deprecated devices. * upgrade - Only build sysupgrade images for deprecated devices. * full - Build both sysupgrade and factory images for deprecated devices. "Other" images are handled like factory images, as they are also used for the initial installation of Gluon on a device.
2019-06-15 12:34:45 +00:00
GLUON_DEPRECATED ?= $(error GLUON_DEPRECATED not set. Please consult the documentation)
build: replace hardcoded paths with overridable variables Signed-off-by: Petr Štetiar <ynezz@true.cz>
2018-10-23 15:48:22 +00:00
# initialize (possibly already user set) directory variables
GLUON_TMPDIR ?= tmp
GLUON_OUTPUTDIR ?= output
GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages
GLUON_TARGETSDIR ?= targets
GLUON_PATCHESDIR ?= patches
$(eval $(call mkabspath,GLUON_TMPDIR))
$(eval $(call mkabspath,GLUON_OUTPUTDIR))
$(eval $(call mkabspath,GLUON_IMAGEDIR))
$(eval $(call mkabspath,GLUON_PACKAGEDIR))
$(eval $(call mkabspath,GLUON_TARGETSDIR))
$(eval $(call mkabspath,GLUON_PATCHESDIR))
gluon-site: disable multidomain support by default
2018-01-25 23:13:37 +00:00
GLUON_MULTIDOMAIN ?= 0
config: check if GLUON_DEBUG is 1 rather than nonempty
2018-01-25 23:03:00 +00:00
GLUON_DEBUG ?= 0
Add GLUON_MINIFY flag to allow skipping the minification process (#1916)
2020-05-12 22:45:06 +00:00
GLUON_MINIFY ?= 1
Use nice OpenWRT make output
2013-02-17 15:30:59 +00:00
build: allow overriding the base feed list
2020-03-07 14:46:55 +00:00
# Can be overridden via environment/command line/... to use the Gluon
# build system for non-Gluon builds
define GLUON_BASE_FEEDS ?=
src-link gluon_base ../../package
endef
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
GLUON_VARS = \
Add GLUON_MINIFY flag to allow skipping the minification process (#1916)
2020-05-12 22:45:06 +00:00
GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_DEBUG GLUON_MINIFY GLUON_DEPRECATED GLUON_DEVICES \
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR \
build: move package list generation to target_config_lib.lua, fix precedence 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)
2020-05-03 19:35:01 +00:00
GLUON_SITEDIR GLUON_RELEASE GLUON_BRANCH GLUON_LANGS GLUON_BASE_FEEDS \
GLUON_TARGET BOARD SUBTARGET
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
unexport $(GLUON_VARS)
GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))
Build kernel compatible to the official OpenWRT release
2013-02-17 23:39:44 +00:00
build: add show-release make target (#1159) `make show-release` can be used to discover the current release in scripts.
2017-06-26 18:52:22 +00:00
show-release:
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@echo '$(GLUON_RELEASE)'
build: add show-release make target (#1159) `make show-release` can be used to discover the current release in scripts.
2017-06-26 18:52:22 +00:00
Further flesh out build system
2013-02-11 22:06:19 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
update: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
export $(GLUON_ENV)
scripts/update.sh
scripts/patch.sh
scripts/feeds.sh
Fix inclusion of profile-specific packages from OpenWRT
2013-10-08 01:57:08 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
update-patches: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
export $(GLUON_ENV)
scripts/update.sh
scripts/update-patches.sh
scripts/patch.sh
Use nice OpenWRT make output
2013-02-17 15:30:59 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
update-feeds: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@$(GLUON_ENV) scripts/feeds.sh
Fix inclusion of profile-specific packages from OpenWRT
2013-10-08 01:57:08 +00:00
Move images to a new directory
2014-02-05 21:12:50 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
GLUON_TARGETS :=
Add support for factory images with other suffixes than .bin and profiles without factory images This adds the new macro GluonProfileFactorySuffix which can be used to override the factory images suffix ".bin". When the suffix is set to the empty string Gluon will assume that there are no factory images.
2015-01-03 03:40:18 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
define GluonTarget
gluon_target := $(1)$$(if $(2),-$(2))
GLUON_TARGETS += $$(gluon_target)
GLUON_TARGET_$$(gluon_target)_BOARD := $(1)
Switch to OpenWrt 18.06 branch
2018-07-10 20:57:40 +00:00
GLUON_TARGET_$$(gluon_target)_SUBTARGET := $(2)
Add support for image types that are neither factory nor sysupgrade
2015-01-25 02:31:37 +00:00
endef
build: replace hardcoded paths with overridable variables Signed-off-by: Petr Štetiar <ynezz@true.cz>
2018-10-23 15:48:22 +00:00
include $(GLUON_TARGETSDIR)/targets.mk
build: use symlinks instead of copies when multiple devices use identical images
2015-10-16 17:11:36 +00:00
Add support for hardware profiles with different module sets
2013-02-12 06:14:18 +00:00
Switch to OpenWrt 18.06 branch
2018-07-10 20:57:40 +00:00
OPENWRTMAKE = $(MAKE) -C openwrt
build: improve handling of repository signing keys
2015-10-14 18:12:52 +00:00
BOARD := $(GLUON_TARGET_$(GLUON_TARGET)_BOARD)
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
SUBTARGET := $(GLUON_TARGET_$(GLUON_TARGET)_SUBTARGET)
build: move all generic config generation to targets/generic As the default package list is now handled using the 'packages' directive, explicit wpad-mini removals in target definitions can be dropped.
2017-09-07 01:21:42 +00:00
build: improve handling of repository signing keys
2015-10-14 18:12:52 +00:00
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
define CheckTarget
if [ -z '$(BOARD)' ]; then
echo 'Please set GLUON_TARGET to a valid target. Gluon supports the following targets:'
for target in $(GLUON_TARGETS); do
echo " * $$target"
done
exit 1
fi
endef
build: use own tmp directory for each target
2015-03-07 17:12:52 +00:00
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
define CheckExternal
if [ ! -d openwrt ]; then
echo "You don't seem to have obtained the external repositories needed by Gluon; please call \`make update\` first!"
exit 1
fi
endef
Use target-specific openwrt directories with symlinks This allows us to use separate .config files per target. Also, don't use OpenWRT's feeds script anymore, but symlink the feeds ourselves.
2014-05-11 08:43:10 +00:00
gluon-site: install domain configs The domain configs are not checked yet, and not used for anything. Based-on-patch-by: lemoer <git@irrelefant.net>
2018-01-19 03:57:48 +00:00
define CheckSite
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
if ! GLUON_SITEDIR='$(GLUON_SITEDIR)' GLUON_SITE_CONFIG='$(1).conf' $(LUA) -e 'assert(dofile("scripts/site_config.lua")(os.getenv("GLUON_SITE_CONFIG")))'; then
build: use .SILENT instead of adding @ to each recipe
2020-03-14 18:15:24 +00:00
echo 'Your site configuration ($(1).conf) did not pass validation'
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
exit 1
fi
gluon-site: install domain configs The domain configs are not checked yet, and not used for anything. Based-on-patch-by: lemoer <git@irrelefant.net>
2018-01-19 03:57:48 +00:00
endef
Use target-specific openwrt directories with symlinks This allows us to use separate .config files per target. Also, don't use OpenWRT's feeds script anymore, but symlink the feeds ourselves.
2014-05-11 08:43:10 +00:00
build: add list-targets make target `make list-targets` can be used to discover the available targets in scripts.
2017-02-16 17:36:20 +00:00
list-targets: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@for target in $(GLUON_TARGETS); do
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
echo "$$target"
done
build: add list-targets make target `make list-targets` can be used to discover the available targets in scripts.
2017-02-16 17:36:20 +00:00
build: add make targets lint, lint-sh, lint-lua [Matthias Schiffer: minor script improvements]
2019-12-14 21:18:58 +00:00
lint: lint-lua lint-sh
lint-lua: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@scripts/lint-lua.sh
build: add make targets lint, lint-sh, lint-lua [Matthias Schiffer: minor script improvements]
2019-12-14 21:18:58 +00:00
lint-sh: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@scripts/lint-sh.sh
build: add list-targets make target `make list-targets` can be used to discover the available targets in scripts.
2017-02-16 17:36:20 +00:00
build: add `make modules` make target `make modules` will generate a opkg repository containing kernel modules matching the kernel of the Gluon images.
2015-10-13 19:36:19 +00:00
Switch to OpenWrt 18.06 branch
2018-07-10 20:57:40 +00:00
LUA := openwrt/staging_dir/hostpkg/bin/lua
build: add `make modules` make target `make modules` will generate a opkg repository containing kernel modules matching the kernel of the Gluon images.
2015-10-13 19:36:19 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
$(LUA):
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
+@
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
$(CheckExternal)
Merge builder Makefile into main Makefile
2013-04-05 20:53:09 +00:00
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
$(OPENWRTMAKE) tools/install
$(OPENWRTMAKE) package/lua/host/compile
Merge builder Makefile into main Makefile
2013-04-05 20:53:09 +00:00
Switch to Lua for target definitions The old bash-based parsing code was way too complex. Replace it with Lua.
2019-06-14 17:20:15 +00:00
config: $(LUA) FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
+@
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
$(CheckExternal)
$(CheckTarget)
$(foreach conf,site $(patsubst $(GLUON_SITEDIR)/%.conf,%,$(wildcard $(GLUON_SITEDIR)/domains/*.conf)),\
$(call CheckSite,$(conf)); \
)
Merge builder Makefile into main Makefile
2013-04-05 20:53:09 +00:00
build: move package list generation to target_config_lib.lua, fix precedence 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)
2020-05-03 19:35:01 +00:00
$(GLUON_ENV) $(LUA) scripts/target_config.lua > openwrt/.config
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
$(OPENWRTMAKE) defconfig
build: move package list generation to target_config_lib.lua, fix precedence 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)
2020-05-03 19:35:01 +00:00
$(GLUON_ENV) $(LUA) scripts/target_config_check.lua
Switch to Lua for target definitions The old bash-based parsing code was way too complex. Replace it with Lua.
2019-06-14 17:20:15 +00:00
all: config
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
+@
build: move package list generation to target_config_lib.lua, fix precedence 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)
2020-05-03 19:35:01 +00:00
$(GLUON_ENV) $(LUA) scripts/clean_output.lua
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
$(OPENWRTMAKE)
build: move package list generation to target_config_lib.lua, fix precedence 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)
2020-05-03 19:35:01 +00:00
$(GLUON_ENV) $(LUA) scripts/copy_output.lua
Merge builder Makefile into main Makefile
2013-04-05 20:53:09 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
clean download: config
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
+@$(OPENWRTMAKE) $@
Merge builder Makefile into main Makefile
2013-04-05 20:53:09 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
dirclean: FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
+@
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
$(OPENWRTMAKE) dirclean
rm -rf $(GLUON_TMPDIR) $(GLUON_OUTPUTDIR)
Merge builder Makefile into main Makefile
2013-04-05 20:53:09 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
manifest: $(LUA) FORCE
Revert "build: use .SILENT instead of adding @ to each recipe" This reverts commit 2a8943e516e61aeefe45e432a371849ead30a47a. .SILENT gets passed down to OpenWrt make as -s through MAKEFLAGS. This hides certain messages from the build log with V=s.
2020-05-11 22:54:55 +00:00
@
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
[ '$(GLUON_BRANCH)' ] || (echo 'Please set GLUON_BRANCH to create a manifest.'; false)
echo '$(GLUON_PRIORITY)' | grep -qE '^([0-9]*\.)?[0-9]+$$' || (echo 'Please specify a numeric value for GLUON_PRIORITY to create a manifest.'; false)
$(CheckExternal)
(
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
export $(GLUON_ENV)
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
echo 'BRANCH=$(GLUON_BRANCH)'
echo "DATE=$$($(LUA) scripts/rfc3339date.lua)"
echo 'PRIORITY=$(GLUON_PRIORITY)'
echo
for target in $(GLUON_TARGETS); do
build: reduce build environment pollution Instead of exporting various variables (unintendedly making them available to the OpenWrt build, possibly bypassing .config), pass the environment only to commands that need it.
2020-03-07 12:47:59 +00:00
$(LUA) scripts/generate_manifest.lua "$$target"
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
done
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
) > 'tmp/$(GLUON_BRANCH).manifest.tmp'
Add manifest generator
2014-02-06 12:20:34 +00:00
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
mkdir -p '$(GLUON_IMAGEDIR)/sysupgrade'
mv 'tmp/$(GLUON_BRANCH).manifest.tmp' '$(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_BRANCH).manifest'
Use nice OpenWRT make output
2013-02-17 15:30:59 +00:00
Use LEDE as base for Gluon
2017-01-18 16:21:43 +00:00
FORCE: ;
.PHONY: FORCE
.NOTPARALLEL:
build: use .ONESHELL By using .ONESHELL and adding -e to .SHELLFLAGS, we can simplify complex shell commands (like manifest generation) and gain a simple way to pass multi-line environment variables into shell commands. The @ and + flags for recipe commands are moved to the top of each recipe.
2020-03-07 13:21:17 +00:00
.ONESHELL:
Reference in New Issue Copy Permalink