7347adb875
Usually gluon calls "git describe" inside the gluon directory to determine
the gluon-version. While this is sufficient in most cases, it becomes
insufficient if you have a meta build system, which patches gluon before
building gluon.
It is actually insufficient, because if you patch gluon before building
it, the the output of "git describe" would then describe the patched
revision and not the base revision (before patching gluon).
After this commit, you can use .scmversion to avoid this problem. By
writing to .scmversion inside the gluon directory before calling make,
gluon will now use the contents of .scmversion instead of "git describe"
to define the gluon-version. So you can write to .scmversion to define
gluon-version before patching gluon in your meta build system.
To do this, you can do something like this in your meta build system:
cd gluon
make show-describe > .scmversion
# apply your own patches to gluon
git am < ...
# make gluon
make GLUON_TARGET=...
Instead of using the output of "make show-describe" as .scmversion, you
can also use any other useful version description. E.g. you may append
the number of additional patches on top of the base commit of gluon (or
so).
As a side note, inside gluon, you can obtain the version (as before) via:
root@platzhalter-525400123457:/# cat /lib/gluon/gluon-version
v2021.1-150-gb39ea759+
root@platzhalter-525400123457:/# gluon-neighbour-info -r nodeinfo
{
...
"software": {
"firmware": {
"base": "gluon-v2021.1-150-gb39ea759+",
...
}
}
}
root@platzhalter-525400123457:/# opkg info gluon-core | grep ^Version:
Version: v2021.1-150-gb39ea759+
229 lines
5.6 KiB
Makefile
229 lines
5.6 KiB
Makefile
all:
|
|
|
|
LC_ALL:=C
|
|
LANG:=C
|
|
export LC_ALL LANG
|
|
|
|
.SHELLFLAGS = -ec
|
|
|
|
# check for spaces & resolve possibly relative paths
|
|
define mkabspath
|
|
ifneq (1,$(words [$($(1))]))
|
|
$$(error $(1) must not contain spaces)
|
|
endif
|
|
override $(1) := $(abspath $($(1)))
|
|
endef
|
|
|
|
escape = '$(subst ','\'',$(1))'
|
|
|
|
GLUON_SITEDIR ?= site
|
|
$(eval $(call mkabspath,GLUON_SITEDIR))
|
|
|
|
$(GLUON_SITEDIR)/site.mk:
|
|
$(error No site configuration was found. Please check out a site configuration to $(GLUON_SITEDIR))
|
|
|
|
include $(GLUON_SITEDIR)/site.mk
|
|
|
|
GLUON_RELEASE ?= $(error GLUON_RELEASE not set. GLUON_RELEASE can be set in site.mk or on the command line)
|
|
|
|
GLUON_DEPRECATED ?= $(error GLUON_DEPRECATED not set. Please consult the documentation)
|
|
|
|
ifneq ($(GLUON_BRANCH),)
|
|
$(warning *** Warning: GLUON_BRANCH has been deprecated, please set GLUON_AUTOUPDATER_BRANCH and GLUON_AUTOUPDATER_ENABLED instead.)
|
|
GLUON_AUTOUPDATER_BRANCH ?= $(GLUON_BRANCH)
|
|
GLUON_AUTOUPDATER_ENABLED ?= 1
|
|
endif
|
|
|
|
GLUON_AUTOUPDATER_ENABLED ?= 0
|
|
|
|
# initialize (possibly already user set) directory variables
|
|
GLUON_TMPDIR ?= tmp
|
|
GLUON_OUTPUTDIR ?= output
|
|
GLUON_IMAGEDIR ?= $(GLUON_OUTPUTDIR)/images
|
|
GLUON_PACKAGEDIR ?= $(GLUON_OUTPUTDIR)/packages
|
|
GLUON_DEBUGDIR ?= $(GLUON_OUTPUTDIR)/debug
|
|
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_MULTIDOMAIN ?= 0
|
|
GLUON_AUTOREMOVE ?= 0
|
|
GLUON_DEBUG ?= 0
|
|
GLUON_MINIFY ?= 1
|
|
|
|
# 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
|
|
|
|
GLUON_VARS = \
|
|
GLUON_RELEASE GLUON_REGION GLUON_MULTIDOMAIN GLUON_AUTOREMOVE GLUON_DEBUG GLUON_MINIFY GLUON_DEPRECATED \
|
|
GLUON_DEVICES GLUON_TARGETSDIR GLUON_PATCHESDIR GLUON_TMPDIR GLUON_IMAGEDIR GLUON_PACKAGEDIR GLUON_DEBUGDIR \
|
|
GLUON_SITEDIR GLUON_RELEASE GLUON_AUTOUPDATER_BRANCH GLUON_AUTOUPDATER_ENABLED GLUON_LANGS GLUON_BASE_FEEDS \
|
|
GLUON_TARGET BOARD SUBTARGET
|
|
|
|
unexport $(GLUON_VARS)
|
|
GLUON_ENV = $(foreach var,$(GLUON_VARS),$(var)=$(call escape,$($(var))))
|
|
|
|
show-release:
|
|
@echo '$(GLUON_RELEASE)'
|
|
|
|
show-version:
|
|
@cat .scmversion 2>/dev/null || git describe --always --dirty=+ 2>/dev/null || echo unknown
|
|
|
|
show-describe:
|
|
@git describe --always --dirty=+ 2>/dev/null || echo unknown
|
|
|
|
update: FORCE
|
|
@
|
|
export $(GLUON_ENV)
|
|
scripts/update.sh
|
|
scripts/patch.sh
|
|
scripts/feeds.sh
|
|
|
|
update-patches: FORCE
|
|
@
|
|
export $(GLUON_ENV)
|
|
scripts/update.sh
|
|
scripts/update-patches.sh
|
|
scripts/patch.sh
|
|
|
|
refresh-patches: FORCE
|
|
@
|
|
export $(GLUON_ENV)
|
|
scripts/update.sh
|
|
scripts/patch.sh
|
|
scripts/update-patches.sh
|
|
|
|
update-feeds: FORCE
|
|
@$(GLUON_ENV) scripts/feeds.sh
|
|
|
|
update-modules: FORCE
|
|
@scripts/update-modules.sh
|
|
|
|
update-ci: FORCE
|
|
@$(GLUON_ENV) scripts/update-ci.sh
|
|
|
|
GLUON_TARGETS :=
|
|
|
|
define GluonTarget
|
|
gluon_target := $(1)$$(if $(2),-$(2))
|
|
GLUON_TARGETS += $$(gluon_target)
|
|
GLUON_TARGET_$$(gluon_target)_BOARD := $(1)
|
|
GLUON_TARGET_$$(gluon_target)_SUBTARGET := $(2)
|
|
endef
|
|
|
|
include $(GLUON_TARGETSDIR)/targets.mk
|
|
|
|
|
|
OPENWRTMAKE = $(MAKE) -C openwrt
|
|
|
|
BOARD := $(GLUON_TARGET_$(GLUON_TARGET)_BOARD)
|
|
SUBTARGET := $(GLUON_TARGET_$(GLUON_TARGET)_SUBTARGET)
|
|
|
|
|
|
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
|
|
|
|
define CheckSite
|
|
if ! GLUON_SITEDIR='$(GLUON_SITEDIR)' GLUON_SITE_CONFIG='$(1).conf' $(LUA) -e 'assert(dofile("scripts/site_config.lua")(os.getenv("GLUON_SITE_CONFIG")))'; then
|
|
echo 'Your site configuration ($(1).conf) did not pass validation'
|
|
exit 1
|
|
fi
|
|
endef
|
|
|
|
list-targets: FORCE
|
|
@for target in $(GLUON_TARGETS); do
|
|
echo "$$target"
|
|
done
|
|
|
|
lint: lint-lua lint-sh
|
|
|
|
lint-lua: FORCE
|
|
@scripts/lint-lua.sh
|
|
|
|
lint-sh: FORCE
|
|
@scripts/lint-sh.sh
|
|
|
|
|
|
LUA := openwrt/staging_dir/hostpkg/bin/lua
|
|
|
|
$(LUA):
|
|
+@
|
|
|
|
scripts/module_check.sh
|
|
|
|
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
|
|
$(OPENWRTMAKE) tools/install
|
|
$(OPENWRTMAKE) package/lua/host/compile
|
|
|
|
|
|
config: $(LUA) FORCE
|
|
+@
|
|
|
|
scripts/module_check.sh
|
|
$(CheckTarget)
|
|
$(foreach conf,site $(patsubst $(GLUON_SITEDIR)/%.conf,%,$(wildcard $(GLUON_SITEDIR)/domains/*.conf)),\
|
|
$(call CheckSite,$(conf)); \
|
|
)
|
|
|
|
$(GLUON_ENV) $(LUA) scripts/target_config.lua > openwrt/.config
|
|
$(OPENWRTMAKE) defconfig
|
|
$(GLUON_ENV) $(LUA) scripts/target_config_check.lua
|
|
|
|
|
|
all: config
|
|
+@
|
|
$(GLUON_ENV) $(LUA) scripts/clean_output.lua
|
|
$(OPENWRTMAKE)
|
|
$(GLUON_ENV) $(LUA) scripts/copy_output.lua
|
|
|
|
clean download: config
|
|
+@$(OPENWRTMAKE) $@
|
|
|
|
dirclean: FORCE
|
|
+@
|
|
[ -e openwrt/.config ] || $(OPENWRTMAKE) defconfig
|
|
$(OPENWRTMAKE) dirclean
|
|
rm -rf $(GLUON_TMPDIR) $(GLUON_OUTPUTDIR)
|
|
|
|
manifest: $(LUA) FORCE
|
|
@
|
|
[ '$(GLUON_AUTOUPDATER_BRANCH)' ] || (echo 'Please set GLUON_AUTOUPDATER_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)
|
|
scripts/module_check.sh
|
|
|
|
(
|
|
export $(GLUON_ENV)
|
|
echo 'BRANCH=$(GLUON_AUTOUPDATER_BRANCH)'
|
|
echo "DATE=$$($(LUA) scripts/rfc3339date.lua)"
|
|
echo 'PRIORITY=$(GLUON_PRIORITY)'
|
|
echo
|
|
for target in $(GLUON_TARGETS); do
|
|
$(LUA) scripts/generate_manifest.lua "$$target"
|
|
done
|
|
) > 'tmp/$(GLUON_AUTOUPDATER_BRANCH).manifest.tmp'
|
|
|
|
mkdir -p '$(GLUON_IMAGEDIR)/sysupgrade'
|
|
mv 'tmp/$(GLUON_AUTOUPDATER_BRANCH).manifest.tmp' '$(GLUON_IMAGEDIR)/sysupgrade/$(GLUON_AUTOUPDATER_BRANCH).manifest'
|
|
|
|
FORCE: ;
|
|
|
|
.PHONY: FORCE
|
|
.NOTPARALLEL:
|
|
.ONESHELL:
|