From a6187cce70d8f1c60e4fcaa961abc80ec5cbea86 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Sep 2021 17:38:03 +0200 Subject: [PATCH 1/4] gluon-core, gluon-site: get version numbers from .config Calling git describe directly breaks isolation between the build system and packages. Replace this with proper .config variables, like we already do for GLUON_RELEASE. Also replace the PKG_VERSION hack with a static '1', as we do for other packages - while having those version numbers in opkg was cute, it was also entirely useless. Having a fixed PKG_VERSION allows us to remove the PKG_BUILD_DIR override as well. --- package/gluon-core/Makefile | 13 ++++++++----- package/gluon-site/Makefile | 14 ++++++++------ 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index 764affb7..cba0ad3c 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -1,11 +1,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-core +PKG_VERSION:=1 -GLUON_VERSION = $(shell git describe --always --dirty=+ 2>/dev/null || echo unknown) -PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION)) - -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) +PKG_CONFIG_DEPENDS := CONFIG_GLUON_VERSION include ../gluon.mk include $(INCLUDE_DIR)/cmake.mk @@ -22,6 +20,11 @@ define Package/gluon-core/description endef define Package/gluon-core/config +config GLUON_VERSION + string "Gluon version number" + depends on PACKAGE_gluon-core + default "" + config GLUON_MINIFY bool "Minify Gluon scripts" default y @@ -36,7 +39,7 @@ define Package/gluon-core/install $(Gluon/Build/Install) $(INSTALL_DIR) $(1)/lib/gluon - echo '$(GLUON_VERSION)' > $(1)/lib/gluon/gluon-version + echo '$(call qstrip,$(CONFIG_GLUON_VERSION))' > $(1)/lib/gluon/gluon-version endef $(eval $(call BuildPackageGluon,gluon-core)) diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile index 9b01ec4d..d8bb6794 100644 --- a/package/gluon-site/Makefile +++ b/package/gluon-site/Makefile @@ -1,17 +1,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-site +PKG_VERSION:=1 GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR)) -GLUON_SITE_VERSION = $(shell ( cd '$(GLUON_SITEDIR)' && git --git-dir=.git describe --always --dirty=+ ) 2>/dev/null || echo unknown) -PKG_VERSION:=$(if $(DUMP),x,$(GLUON_SITE_VERSION)) -PKG_CONFIG_DEPENDS := CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN +PKG_CONFIG_DEPENDS := CONFIG_GLUON_SITE_VERSION CONFIG_GLUON_RELEASE CONFIG_GLUON_SITEDIR CONFIG_GLUON_MULTIDOMAIN PKG_FILE_DEPENDS := $(GLUON_SITEDIR)/site.conf $(GLUON_SITEDIR)/domains/ $(GLUON_SITEDIR)/i18n/ PKG_BUILD_DEPENDS := lua-jsonc/host gluon-web/host -PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) - include ../gluon.mk PKG_CONFIG_DEPENDS += $(GLUON_I18N_CONFIG) @@ -21,6 +18,11 @@ define Package/gluon-site endef define Package/gluon-site/config +config GLUON_SITE_VERSION + string "Gluon site version number" + depends on PACKAGE_gluon-site + default "" + config GLUON_RELEASE string "Gluon release number" depends on PACKAGE_gluon-site @@ -83,7 +85,7 @@ define Package/gluon-site/install $(CP) $(PKG_BUILD_DIR)/domains $(1)/lib/gluon/ endif - echo '$(GLUON_SITE_VERSION)' > $(1)/lib/gluon/site-version + echo '$(call qstrip,$(CONFIG_GLUON_SITE_VERSION))' > $(1)/lib/gluon/site-version echo '$(call qstrip,$(CONFIG_GLUON_RELEASE))' > $(1)/lib/gluon/release $(GluonInstallI18N) From b5db6435e5dec85498e3b78f76d33b6cfbc63815 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Sep 2021 17:55:44 +0200 Subject: [PATCH 2/4] build: pass GLUON_VERSION and GLUON_SITE_VERSION to build A helper script is introduced to get the version from `git describe`. --- Makefile | 4 ++++ scripts/getversion.sh | 12 ++++++++++++ targets/generic | 2 ++ 3 files changed, 18 insertions(+) create mode 100755 scripts/getversion.sh diff --git a/Makefile b/Makefile index b49ebe80..760335a2 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,9 @@ $(eval $(call mkabspath,GLUON_PACKAGEDIR)) $(eval $(call mkabspath,GLUON_TARGETSDIR)) $(eval $(call mkabspath,GLUON_PATCHESDIR)) +GLUON_VERSION := $(shell scripts/getversion.sh '.') +GLUON_SITE_VERSION := $(shell scripts/getversion.sh '$(GLUON_SITEDIR)') + GLUON_MULTIDOMAIN ?= 0 GLUON_AUTOREMOVE ?= 0 GLUON_DEBUG ?= 0 @@ -64,6 +67,7 @@ src-link gluon_base ../../package endef GLUON_VARS = \ + GLUON_VERSION GLUON_SITE_VERSION \ 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 \ diff --git a/scripts/getversion.sh b/scripts/getversion.sh new file mode 100755 index 00000000..cbb7cf60 --- /dev/null +++ b/scripts/getversion.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ $# -ne 1 ]; then + echo >&2 "Usage: getversion.sh " + exit 1 +fi + +cd "$1" || exit 1 + +git --git-dir=.git describe --always --abbrev=7 --dirty=+ 2>/dev/null && exit 0 + +echo unknown diff --git a/targets/generic b/targets/generic index cd72112f..b0943d9b 100644 --- a/targets/generic +++ b/targets/generic @@ -2,6 +2,8 @@ assert(env.GLUON_LANGS) config('GLUON_SITEDIR', env.GLUON_SITEDIR) +config('GLUON_VERSION', env.GLUON_VERSION) +config('GLUON_SITE_VERSION', env.GLUON_SITE_VERSION) config('GLUON_RELEASE', env.GLUON_RELEASE) try_config('GLUON_AUTOUPDATER_BRANCH', env.GLUON_AUTOUPDATER_BRANCH) From 1c89f616a92d09fa2eef6ec74c66d76fdd19b4b2 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Sep 2021 17:57:34 +0200 Subject: [PATCH 3/4] build: add support for .scmversion files for GLUON_VERSION and GLUON_SITE_VERSION Sometimes it is useful to override the default version detection, for example when local patches are applied to a repo. Allow providing a version number using a file called .scmversion, which is the same that the Linux kernel and U-Boot use. --- .gitignore | 1 + docs/dev/build.rst | 14 ++++++++++++++ scripts/getversion.sh | 1 + 3 files changed, 16 insertions(+) diff --git a/.gitignore b/.gitignore index a929851e..c8127218 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ .bash_history .subversion .wget-hsts +/.scmversion diff --git a/docs/dev/build.rst b/docs/dev/build.rst index 74b9aa11..92fd672b 100644 --- a/docs/dev/build.rst +++ b/docs/dev/build.rst @@ -88,3 +88,17 @@ update.sh source and installs it into *packages/* directory. It simply tries to set the *base* branch of the cloned repo to the correct commit. If this fails it fetches the upstream branch and tries again to set the local *base* branch. + +getversion.sh + Used to determine the version numbers of the repositories of Gluon and the + site configuraiton, to be included in the built firmware images as + */lib/gluon/gluon-version* and */lib/gluon/site-version*. + + By default, this uses ``git describe`` to generate a version number based + on the last git tag. This can be overridden by putting a file called + *.scmversion* into the root of the respective repositories. + + A command like ``rm -f .scmversion; echo "$(./scripts/getversion.sh .)" > .scmversion`` + can be used before applying local patches to ensure that the reported + version numbers refer to an upstream commit ID rather than an arbitrary + local one after ``git am``. diff --git a/scripts/getversion.sh b/scripts/getversion.sh index cbb7cf60..8c437762 100755 --- a/scripts/getversion.sh +++ b/scripts/getversion.sh @@ -7,6 +7,7 @@ fi cd "$1" || exit 1 +cat .scmversion 2>/dev/null && exit 0 git --git-dir=.git describe --always --abbrev=7 --dirty=+ 2>/dev/null && exit 0 echo unknown From f419db58a233634f55f4024318fb750a9357fa42 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Tue, 21 Sep 2021 18:05:58 +0200 Subject: [PATCH 4/4] Set PKG_VERSION in gluon.mk This removes PKG_VERSION and PKG_RELEASE from most Makefiles, as the value was never useful for Gluon packages; instead, PKG_VERSION is set to 1 in gluon.mk. It also removes two other weird definitions: - gluon-iptables-clamp-mss-to-pmtu replicating the old PKG_VERSION logic from gluon-core, but without the fixed PKG_BUILD_DIR to prevent unnessary rebuilds - gluon-hoodselector set GLUON_VERSION=3 --- package/gluon-alfred/Makefile | 2 -- package/gluon-authorized-keys/Makefile | 1 - package/gluon-autoupdater/Makefile | 1 - package/gluon-client-bridge/Makefile | 1 - package/gluon-config-mode-autoupdater/Makefile | 1 - package/gluon-config-mode-contact-info/Makefile | 1 - package/gluon-config-mode-core/Makefile | 1 - package/gluon-config-mode-domain-select/Makefile | 1 - package/gluon-config-mode-geo-location-osm/Makefile | 1 - package/gluon-config-mode-geo-location/Makefile | 1 - package/gluon-config-mode-hostname/Makefile | 1 - package/gluon-config-mode-mesh-vpn/Makefile | 1 - package/gluon-config-mode-outdoor/Makefile | 1 - package/gluon-config-mode-theme/Makefile | 1 - package/gluon-core/Makefile | 1 - package/gluon-ebtables-filter-multicast/Makefile | 2 -- package/gluon-ebtables-filter-ra-dhcp/Makefile | 2 -- package/gluon-ebtables-limit-arp/Makefile | 2 -- package/gluon-ebtables-source-filter/Makefile | 2 -- package/gluon-ebtables/Makefile | 2 -- package/gluon-hoodselector/Makefile | 3 --- package/gluon-iptables-clamp-mss-to-pmtu/Makefile | 3 --- package/gluon-l3roamd/Makefile | 1 - package/gluon-lock-password/Makefile | 2 -- package/gluon-logging/Makefile | 1 - package/gluon-mesh-babel/Makefile | 1 - package/gluon-mesh-batman-adv/Makefile | 1 - package/gluon-mesh-vpn-core/Makefile | 1 - package/gluon-mesh-vpn-fastd/Makefile | 1 - package/gluon-mesh-vpn-tunneldigger/Makefile | 1 - package/gluon-mesh-vpn-wireguard/Makefile | 1 - package/gluon-mesh-wireless-sae/Makefile | 1 - package/gluon-mmfd/Makefile | 1 - package/gluon-neighbour-info/Makefile | 2 -- package/gluon-node-info/Makefile | 2 -- package/gluon-private-wifi/Makefile | 1 - package/gluon-radv-filterd/Makefile | 2 -- package/gluon-radvd/Makefile | 1 - package/gluon-respondd/Makefile | 1 - package/gluon-scheduled-domain-switch/Makefile | 1 - package/gluon-setup-mode/Makefile | 1 - package/gluon-site/Makefile | 1 - package/gluon-state-check/Makefile | 1 - package/gluon-status-page-mesh-batman-adv/Makefile | 1 - package/gluon-status-page/Makefile | 1 - package/gluon-wan-dnsmasq/Makefile | 1 - package/gluon-web-admin/Makefile | 2 -- package/gluon-web-autoupdater/Makefile | 2 -- package/gluon-web-logging/Makefile | 2 -- package/gluon-web-mesh-vpn-fastd/Makefile | 2 -- package/gluon-web-model/Makefile | 1 - package/gluon-web-network/Makefile | 2 -- package/gluon-web-node-role/Makefile | 1 - package/gluon-web-osm/Makefile | 1 - package/gluon-web-private-wifi/Makefile | 2 -- package/gluon-web-wifi-config/Makefile | 2 -- package/gluon-web/Makefile | 1 - package/gluon-wireless-encryption/Makefile | 1 - package/gluon.mk | 2 ++ 59 files changed, 2 insertions(+), 79 deletions(-) diff --git a/package/gluon-alfred/Makefile b/package/gluon-alfred/Makefile index 7c173a77..fd7e7120 100644 --- a/package/gluon-alfred/Makefile +++ b/package/gluon-alfred/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-alfred -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-authorized-keys/Makefile b/package/gluon-authorized-keys/Makefile index d5b3a907..3cbca241 100644 --- a/package/gluon-authorized-keys/Makefile +++ b/package/gluon-authorized-keys/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-authorized-keys -PKG_VERSION:=2 include ../gluon.mk diff --git a/package/gluon-autoupdater/Makefile b/package/gluon-autoupdater/Makefile index 368dce1b..61a8ba21 100644 --- a/package/gluon-autoupdater/Makefile +++ b/package/gluon-autoupdater/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-autoupdater -PKG_VERSION:=4 PKG_CONFIG_DEPENDS := CONFIG_GLUON_AUTOUPDATER_BRANCH CONFIG_GLUON_AUTOUPDATER_ENABLED diff --git a/package/gluon-client-bridge/Makefile b/package/gluon-client-bridge/Makefile index e65e4eef..d1005d86 100644 --- a/package/gluon-client-bridge/Makefile +++ b/package/gluon-client-bridge/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-client-bridge -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-autoupdater/Makefile b/package/gluon-config-mode-autoupdater/Makefile index b94d3b45..d5a9d7f7 100644 --- a/package/gluon-config-mode-autoupdater/Makefile +++ b/package/gluon-config-mode-autoupdater/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-autoupdater -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-contact-info/Makefile b/package/gluon-config-mode-contact-info/Makefile index ad27ffa2..d7382b58 100644 --- a/package/gluon-config-mode-contact-info/Makefile +++ b/package/gluon-config-mode-contact-info/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-contact-info -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-core/Makefile b/package/gluon-config-mode-core/Makefile index b9c39487..0c3a0f42 100644 --- a/package/gluon-config-mode-core/Makefile +++ b/package/gluon-config-mode-core/Makefile @@ -4,7 +4,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-core -PKG_VERSION:=2 include ../gluon.mk diff --git a/package/gluon-config-mode-domain-select/Makefile b/package/gluon-config-mode-domain-select/Makefile index b1ded939..98897752 100644 --- a/package/gluon-config-mode-domain-select/Makefile +++ b/package/gluon-config-mode-domain-select/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-domain-select -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-geo-location-osm/Makefile b/package/gluon-config-mode-geo-location-osm/Makefile index 4dbaf9d0..2e101223 100644 --- a/package/gluon-config-mode-geo-location-osm/Makefile +++ b/package/gluon-config-mode-geo-location-osm/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-geo-location-osm -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-geo-location/Makefile b/package/gluon-config-mode-geo-location/Makefile index a020feb9..7c7f8079 100644 --- a/package/gluon-config-mode-geo-location/Makefile +++ b/package/gluon-config-mode-geo-location/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-geo-location -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-hostname/Makefile b/package/gluon-config-mode-hostname/Makefile index fdf3acd9..8285f5bb 100644 --- a/package/gluon-config-mode-hostname/Makefile +++ b/package/gluon-config-mode-hostname/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-hostname -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-mesh-vpn/Makefile b/package/gluon-config-mode-mesh-vpn/Makefile index 0c3a752d..b55d532a 100644 --- a/package/gluon-config-mode-mesh-vpn/Makefile +++ b/package/gluon-config-mode-mesh-vpn/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-mesh-vpn -PKG_VERSION:=2 include ../gluon.mk diff --git a/package/gluon-config-mode-outdoor/Makefile b/package/gluon-config-mode-outdoor/Makefile index 2f3acfcd..049cf52e 100644 --- a/package/gluon-config-mode-outdoor/Makefile +++ b/package/gluon-config-mode-outdoor/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-outdoor -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-config-mode-theme/Makefile b/package/gluon-config-mode-theme/Makefile index 38858f0c..7f20fbdb 100644 --- a/package/gluon-config-mode-theme/Makefile +++ b/package/gluon-config-mode-theme/Makefile @@ -4,7 +4,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-config-mode-theme -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-core/Makefile b/package/gluon-core/Makefile index cba0ad3c..c56b78bb 100644 --- a/package/gluon-core/Makefile +++ b/package/gluon-core/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-core -PKG_VERSION:=1 PKG_CONFIG_DEPENDS := CONFIG_GLUON_VERSION diff --git a/package/gluon-ebtables-filter-multicast/Makefile b/package/gluon-ebtables-filter-multicast/Makefile index dc579a2a..92b2be2a 100644 --- a/package/gluon-ebtables-filter-multicast/Makefile +++ b/package/gluon-ebtables-filter-multicast/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-ebtables-filter-multicast -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-ebtables-filter-ra-dhcp/Makefile b/package/gluon-ebtables-filter-ra-dhcp/Makefile index c650bb89..bc52747a 100644 --- a/package/gluon-ebtables-filter-ra-dhcp/Makefile +++ b/package/gluon-ebtables-filter-ra-dhcp/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-ebtables-filter-ra-dhcp -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-ebtables-limit-arp/Makefile b/package/gluon-ebtables-limit-arp/Makefile index 852900ef..5f71b1c8 100644 --- a/package/gluon-ebtables-limit-arp/Makefile +++ b/package/gluon-ebtables-limit-arp/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-ebtables-limit-arp -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-ebtables-source-filter/Makefile b/package/gluon-ebtables-source-filter/Makefile index 2c14a793..17377e1f 100644 --- a/package/gluon-ebtables-source-filter/Makefile +++ b/package/gluon-ebtables-source-filter/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-ebtables-source-filter -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-ebtables/Makefile b/package/gluon-ebtables/Makefile index e15cfe59..e69a83bf 100644 --- a/package/gluon-ebtables/Makefile +++ b/package/gluon-ebtables/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-ebtables -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-hoodselector/Makefile b/package/gluon-hoodselector/Makefile index 394deeae..9706a605 100644 --- a/package/gluon-hoodselector/Makefile +++ b/package/gluon-hoodselector/Makefile @@ -2,9 +2,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-hoodselector -GLUON_VERSION:=3 -PKG_VERSION:=2 - include ../gluon.mk define Package/gluon-hoodselector diff --git a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile index c3f84988..b8135c2f 100644 --- a/package/gluon-iptables-clamp-mss-to-pmtu/Makefile +++ b/package/gluon-iptables-clamp-mss-to-pmtu/Makefile @@ -2,9 +2,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-iptables-clamp-mss-to-pmtu -GLUON_VERSION = $(shell git describe --always --dirty=+ 2>/dev/null || echo unknown) -PKG_VERSION:=$(if $(DUMP),x,$(GLUON_VERSION)) - include ../gluon.mk define Package/$(PKG_NAME) diff --git a/package/gluon-l3roamd/Makefile b/package/gluon-l3roamd/Makefile index 0702749f..4259bb85 100644 --- a/package/gluon-l3roamd/Makefile +++ b/package/gluon-l3roamd/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-l3roamd -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-lock-password/Makefile b/package/gluon-lock-password/Makefile index 366fd7b8..2275d33e 100644 --- a/package/gluon-lock-password/Makefile +++ b/package/gluon-lock-password/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-lock-password -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-logging/Makefile b/package/gluon-logging/Makefile index 735a6f9e..dde7bcd2 100644 --- a/package/gluon-logging/Makefile +++ b/package/gluon-logging/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-logging -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-mesh-babel/Makefile b/package/gluon-mesh-babel/Makefile index bdc3d4bc..3abe66df 100644 --- a/package/gluon-mesh-babel/Makefile +++ b/package/gluon-mesh-babel/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-babel -PKG_VERSION:=1 PKG_BUILD_DEPENDS := libbabelhelper PKG_BUILD_DEPENDS += libjson-c diff --git a/package/gluon-mesh-batman-adv/Makefile b/package/gluon-mesh-batman-adv/Makefile index 1d124584..aac41f1b 100644 --- a/package/gluon-mesh-batman-adv/Makefile +++ b/package/gluon-mesh-batman-adv/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-batman-adv -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-mesh-vpn-core/Makefile b/package/gluon-mesh-vpn-core/Makefile index 4e4c23c4..3679e2bc 100644 --- a/package/gluon-mesh-vpn-core/Makefile +++ b/package/gluon-mesh-vpn-core/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-vpn-core -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-mesh-vpn-fastd/Makefile b/package/gluon-mesh-vpn-fastd/Makefile index de5111ca..cb6f6da4 100644 --- a/package/gluon-mesh-vpn-fastd/Makefile +++ b/package/gluon-mesh-vpn-fastd/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-vpn-fastd -PKG_VERSION:=3 include ../gluon.mk diff --git a/package/gluon-mesh-vpn-tunneldigger/Makefile b/package/gluon-mesh-vpn-tunneldigger/Makefile index 376cec09..3a206e81 100644 --- a/package/gluon-mesh-vpn-tunneldigger/Makefile +++ b/package/gluon-mesh-vpn-tunneldigger/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-vpn-tunneldigger -PKG_VERSION:=3 include ../gluon.mk diff --git a/package/gluon-mesh-vpn-wireguard/Makefile b/package/gluon-mesh-vpn-wireguard/Makefile index c7c21e53..cae8781a 100644 --- a/package/gluon-mesh-vpn-wireguard/Makefile +++ b/package/gluon-mesh-vpn-wireguard/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-vpn-wireguard -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-mesh-wireless-sae/Makefile b/package/gluon-mesh-wireless-sae/Makefile index e17ee850..3fe755ab 100644 --- a/package/gluon-mesh-wireless-sae/Makefile +++ b/package/gluon-mesh-wireless-sae/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mesh-wireless-sae -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-mmfd/Makefile b/package/gluon-mmfd/Makefile index dc66bf4f..4e767db5 100644 --- a/package/gluon-mmfd/Makefile +++ b/package/gluon-mmfd/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-mmfd -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-neighbour-info/Makefile b/package/gluon-neighbour-info/Makefile index af58036c..903cb02c 100644 --- a/package/gluon-neighbour-info/Makefile +++ b/package/gluon-neighbour-info/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-neighbour-info -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-node-info/Makefile b/package/gluon-node-info/Makefile index 79503a15..20bae57b 100644 --- a/package/gluon-node-info/Makefile +++ b/package/gluon-node-info/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-node-info -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-private-wifi/Makefile b/package/gluon-private-wifi/Makefile index 622334b5..0e0080ae 100644 --- a/package/gluon-private-wifi/Makefile +++ b/package/gluon-private-wifi/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-private-wifi -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-radv-filterd/Makefile b/package/gluon-radv-filterd/Makefile index 28d778c1..4cab8960 100644 --- a/package/gluon-radv-filterd/Makefile +++ b/package/gluon-radv-filterd/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-radv-filterd -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-radvd/Makefile b/package/gluon-radvd/Makefile index a3957530..430374e4 100644 --- a/package/gluon-radvd/Makefile +++ b/package/gluon-radvd/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-radvd -PKG_VERSION:=3 include ../gluon.mk diff --git a/package/gluon-respondd/Makefile b/package/gluon-respondd/Makefile index 52839a86..2fda9007 100644 --- a/package/gluon-respondd/Makefile +++ b/package/gluon-respondd/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-respondd -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-scheduled-domain-switch/Makefile b/package/gluon-scheduled-domain-switch/Makefile index b1d7f786..6d79c221 100644 --- a/package/gluon-scheduled-domain-switch/Makefile +++ b/package/gluon-scheduled-domain-switch/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-scheduled-domain-switch -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-setup-mode/Makefile b/package/gluon-setup-mode/Makefile index 8efa2a4c..5ee9117c 100644 --- a/package/gluon-setup-mode/Makefile +++ b/package/gluon-setup-mode/Makefile @@ -4,7 +4,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-setup-mode -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-site/Makefile b/package/gluon-site/Makefile index d8bb6794..4bad6ec1 100644 --- a/package/gluon-site/Makefile +++ b/package/gluon-site/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-site -PKG_VERSION:=1 GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR)) diff --git a/package/gluon-state-check/Makefile b/package/gluon-state-check/Makefile index 28fd2418..14028d88 100644 --- a/package/gluon-state-check/Makefile +++ b/package/gluon-state-check/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-state-check -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-status-page-mesh-batman-adv/Makefile b/package/gluon-status-page-mesh-batman-adv/Makefile index 4d2ed8f0..0fc8781f 100644 --- a/package/gluon-status-page-mesh-batman-adv/Makefile +++ b/package/gluon-status-page-mesh-batman-adv/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-status-page-mesh-batman-adv -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-status-page/Makefile b/package/gluon-status-page/Makefile index c30229e3..b4eea874 100644 --- a/package/gluon-status-page/Makefile +++ b/package/gluon-status-page/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-status-page -PKG_VERSION:=3 include ../gluon.mk diff --git a/package/gluon-wan-dnsmasq/Makefile b/package/gluon-wan-dnsmasq/Makefile index b8dfa71c..da42cf01 100644 --- a/package/gluon-wan-dnsmasq/Makefile +++ b/package/gluon-wan-dnsmasq/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-wan-dnsmasq -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-web-admin/Makefile b/package/gluon-web-admin/Makefile index d555be61..aa26e8cd 100644 --- a/package/gluon-web-admin/Makefile +++ b/package/gluon-web-admin/Makefile @@ -4,8 +4,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-admin -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web-autoupdater/Makefile b/package/gluon-web-autoupdater/Makefile index c50e731a..9b6a7d06 100644 --- a/package/gluon-web-autoupdater/Makefile +++ b/package/gluon-web-autoupdater/Makefile @@ -4,8 +4,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-autoupdater -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web-logging/Makefile b/package/gluon-web-logging/Makefile index 10d83740..9463e1c1 100644 --- a/package/gluon-web-logging/Makefile +++ b/package/gluon-web-logging/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-logging -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web-mesh-vpn-fastd/Makefile b/package/gluon-web-mesh-vpn-fastd/Makefile index 46dfd181..c7fdb6e1 100644 --- a/package/gluon-web-mesh-vpn-fastd/Makefile +++ b/package/gluon-web-mesh-vpn-fastd/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-mesh-vpn-fastd -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web-model/Makefile b/package/gluon-web-model/Makefile index d767f562..518a5b47 100644 --- a/package/gluon-web-model/Makefile +++ b/package/gluon-web-model/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-model -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-web-network/Makefile b/package/gluon-web-network/Makefile index 42620fe5..17a83b85 100644 --- a/package/gluon-web-network/Makefile +++ b/package/gluon-web-network/Makefile @@ -4,8 +4,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-network -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web-node-role/Makefile b/package/gluon-web-node-role/Makefile index 81283761..516146bc 100644 --- a/package/gluon-web-node-role/Makefile +++ b/package/gluon-web-node-role/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-node-role -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-web-osm/Makefile b/package/gluon-web-osm/Makefile index a59f7f9f..3594da80 100644 --- a/package/gluon-web-osm/Makefile +++ b/package/gluon-web-osm/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-osm -PKG_VERSION:=1 include ../gluon.mk diff --git a/package/gluon-web-private-wifi/Makefile b/package/gluon-web-private-wifi/Makefile index f016abf4..971189cc 100644 --- a/package/gluon-web-private-wifi/Makefile +++ b/package/gluon-web-private-wifi/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-private-wifi -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web-wifi-config/Makefile b/package/gluon-web-wifi-config/Makefile index 7827491e..e18febad 100644 --- a/package/gluon-web-wifi-config/Makefile +++ b/package/gluon-web-wifi-config/Makefile @@ -1,8 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web-wifi-config -PKG_VERSION:=1 -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon-web/Makefile b/package/gluon-web/Makefile index decc9c84..54460a48 100644 --- a/package/gluon-web/Makefile +++ b/package/gluon-web/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-web -PKG_VERSION:=1 PKG_INSTALL:=1 diff --git a/package/gluon-wireless-encryption/Makefile b/package/gluon-wireless-encryption/Makefile index 35b61576..879054f8 100644 --- a/package/gluon-wireless-encryption/Makefile +++ b/package/gluon-wireless-encryption/Makefile @@ -1,7 +1,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gluon-wireless-encryption -PKG_RELEASE:=1 include ../gluon.mk diff --git a/package/gluon.mk b/package/gluon.mk index a2aab619..40f9274f 100644 --- a/package/gluon.mk +++ b/package/gluon.mk @@ -1,6 +1,8 @@ GLUON_MK := $(abspath $(lastword $(MAKEFILE_LIST))) PKG_FILE_DEPENDS += $(GLUON_MK) +PKG_VERSION ?= 1 + PKG_BUILD_DEPENDS += luasrcdiet/host ifneq ($(wildcard ./luasrc/.),)