From f419db58a233634f55f4024318fb750a9357fa42 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer <mschiffer@universe-factory.net> Date: Tue, 21 Sep 2021 18:05:58 +0200 Subject: [PATCH] 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 7c173a773..fd7e71204 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 d5b3a907e..3cbca2412 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 368dce1b5..61a8ba213 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 e65e4eeff..d1005d866 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 b94d3b450..d5a9d7f70 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 ad27ffa2f..d7382b583 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 b9c394871..0c3a0f423 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 b1ded9391..988977520 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 4dbaf9d00..2e101223f 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 a020feb91..7c7f80797 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 fdf3acd9b..8285f5bb7 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 0c3a752df..b55d532ab 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 2f3acfcd1..049cf52e0 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 38858f0cd..7f20fbdbf 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 cba0ad3c2..c56b78bbd 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 dc579a2a8..92b2be2ae 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 c650bb896..bc52747a3 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 852900ef1..5f71b1c8f 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 2c14a7932..17377e1fa 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 e15cfe596..e69a83bf1 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 394deeae3..9706a6058 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 c3f849882..b8135c2ff 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 0702749f3..4259bb852 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 366fd7b80..2275d33ec 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 735a6f9e3..dde7bcd2f 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 bdc3d4bca..3abe66df0 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 1d124584c..aac41f1ba 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 4e4c23c4e..3679e2bcb 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 de5111ca5..cb6f6da4c 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 376cec098..3a206e816 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 c7c21e53c..cae8781a4 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 e17ee8507..3fe755aba 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 dc66bf4f4..4e767db55 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 af58036c4..903cb02cf 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 79503a155..20bae57b8 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 622334b52..0e0080ae3 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 28d778c17..4cab89606 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 a3957530e..430374e41 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 52839a864..2fda90071 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 b1d7f786d..6d79c221d 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 8efa2a4c6..5ee9117c9 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 d8bb67945..4bad6ec11 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 28fd24189..14028d887 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 4d2ed8f0d..0fc8781f2 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 c30229e37..b4eea8743 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 b8dfa71c1..da42cf016 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 d555be615..aa26e8cd2 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 c50e731a0..9b6a7d060 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 10d83740d..9463e1c13 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 46dfd1817..c7fdb6e1e 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 d767f562b..518a5b472 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 42620fe54..17a83b85c 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 812837613..516146bc0 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 a59f7f9f4..3594da803 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 f016abf44..971189cc1 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 7827491e7..e18febad3 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 decc9c84d..54460a48e 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 35b615760..879054f81 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 a2aab6197..40f9274f3 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/.),) -- GitLab