alex
/
gluon-firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Matthias Schiffer 2021-09-21 18:05:58 +02:00
parent 1c89f616a9
commit f419db58a2
59 changed files with 2 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-alfred/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-alfred PKG_NAME:=gluon-alfred
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-authorized-keys/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-authorized-keys PKG_NAME:=gluon-authorized-keys
PKG_VERSION:=2
include ../gluon.mk include ../gluon.mk

1
package/gluon-autoupdater/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-autoupdater PKG_NAME:=gluon-autoupdater
PKG_VERSION:=4
PKG_CONFIG_DEPENDS := CONFIG_GLUON_AUTOUPDATER_BRANCH CONFIG_GLUON_AUTOUPDATER_ENABLED PKG_CONFIG_DEPENDS := CONFIG_GLUON_AUTOUPDATER_BRANCH CONFIG_GLUON_AUTOUPDATER_ENABLED

1
package/gluon-client-bridge/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-client-bridge PKG_NAME:=gluon-client-bridge
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-autoupdater/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-autoupdater PKG_NAME:=gluon-config-mode-autoupdater
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-contact-info/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-contact-info PKG_NAME:=gluon-config-mode-contact-info
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-core/Makefile
View File

@ -4,7 +4,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-core PKG_NAME:=gluon-config-mode-core
PKG_VERSION:=2
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-domain-select/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-domain-select PKG_NAME:=gluon-config-mode-domain-select
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-geo-location-osm/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-geo-location-osm PKG_NAME:=gluon-config-mode-geo-location-osm
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-geo-location/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-geo-location PKG_NAME:=gluon-config-mode-geo-location
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-hostname/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-hostname PKG_NAME:=gluon-config-mode-hostname
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-mesh-vpn/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-mesh-vpn PKG_NAME:=gluon-config-mode-mesh-vpn
PKG_VERSION:=2
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-outdoor/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-outdoor PKG_NAME:=gluon-config-mode-outdoor
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-config-mode-theme/Makefile
View File

@ -4,7 +4,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-config-mode-theme PKG_NAME:=gluon-config-mode-theme
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-core/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-core PKG_NAME:=gluon-core
PKG_VERSION:=1
PKG_CONFIG_DEPENDS := CONFIG_GLUON_VERSION PKG_CONFIG_DEPENDS := CONFIG_GLUON_VERSION

2
package/gluon-ebtables-filter-multicast/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-ebtables-filter-multicast PKG_NAME:=gluon-ebtables-filter-multicast
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-ebtables-filter-ra-dhcp/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-ebtables-filter-ra-dhcp PKG_NAME:=gluon-ebtables-filter-ra-dhcp
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-ebtables-limit-arp/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-ebtables-limit-arp PKG_NAME:=gluon-ebtables-limit-arp
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-ebtables-source-filter/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-ebtables-source-filter PKG_NAME:=gluon-ebtables-source-filter
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-ebtables/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-ebtables PKG_NAME:=gluon-ebtables
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

3
package/gluon-hoodselector/Makefile
View File

@ -2,9 +2,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-hoodselector PKG_NAME:=gluon-hoodselector
GLUON_VERSION:=3
PKG_VERSION:=2
include ../gluon.mk include ../gluon.mk
define Package/gluon-hoodselector define Package/gluon-hoodselector

3
package/gluon-iptables-clamp-mss-to-pmtu/Makefile
View File

@ -2,9 +2,6 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-iptables-clamp-mss-to-pmtu 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 include ../gluon.mk
define Package/$(PKG_NAME) define Package/$(PKG_NAME)

1
package/gluon-l3roamd/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-l3roamd PKG_NAME:=gluon-l3roamd
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-lock-password/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-lock-password PKG_NAME:=gluon-lock-password
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-logging/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-logging PKG_NAME:=gluon-logging
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-mesh-babel/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-babel PKG_NAME:=gluon-mesh-babel
PKG_VERSION:=1
PKG_BUILD_DEPENDS := libbabelhelper PKG_BUILD_DEPENDS := libbabelhelper
PKG_BUILD_DEPENDS += libjson-c PKG_BUILD_DEPENDS += libjson-c

1
package/gluon-mesh-batman-adv/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-batman-adv PKG_NAME:=gluon-mesh-batman-adv
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-mesh-vpn-core/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-core PKG_NAME:=gluon-mesh-vpn-core
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-mesh-vpn-fastd/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-fastd PKG_NAME:=gluon-mesh-vpn-fastd
PKG_VERSION:=3
include ../gluon.mk include ../gluon.mk

1
package/gluon-mesh-vpn-tunneldigger/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-tunneldigger PKG_NAME:=gluon-mesh-vpn-tunneldigger
PKG_VERSION:=3
include ../gluon.mk include ../gluon.mk

1
package/gluon-mesh-vpn-wireguard/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-vpn-wireguard PKG_NAME:=gluon-mesh-vpn-wireguard
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-mesh-wireless-sae/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mesh-wireless-sae PKG_NAME:=gluon-mesh-wireless-sae
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-mmfd/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-mmfd PKG_NAME:=gluon-mmfd
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-neighbour-info/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-neighbour-info PKG_NAME:=gluon-neighbour-info
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-node-info/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-node-info PKG_NAME:=gluon-node-info
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-private-wifi/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-private-wifi PKG_NAME:=gluon-private-wifi
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-radv-filterd/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-radv-filterd PKG_NAME:=gluon-radv-filterd
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-radvd/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-radvd PKG_NAME:=gluon-radvd
PKG_VERSION:=3
include ../gluon.mk include ../gluon.mk

1
package/gluon-respondd/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-respondd PKG_NAME:=gluon-respondd
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-scheduled-domain-switch/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-scheduled-domain-switch PKG_NAME:=gluon-scheduled-domain-switch
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-setup-mode/Makefile
View File

@ -4,7 +4,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-setup-mode PKG_NAME:=gluon-setup-mode
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-site/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-site PKG_NAME:=gluon-site
PKG_VERSION:=1
GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR)) GLUON_SITEDIR = $(call qstrip,$(CONFIG_GLUON_SITEDIR))

1
package/gluon-state-check/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-state-check PKG_NAME:=gluon-state-check
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-status-page-mesh-batman-adv/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-status-page-mesh-batman-adv PKG_NAME:=gluon-status-page-mesh-batman-adv
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-status-page/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-status-page PKG_NAME:=gluon-status-page
PKG_VERSION:=3
include ../gluon.mk include ../gluon.mk

1
package/gluon-wan-dnsmasq/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-wan-dnsmasq PKG_NAME:=gluon-wan-dnsmasq
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-admin/Makefile
View File

@ -4,8 +4,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-admin PKG_NAME:=gluon-web-admin
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-autoupdater/Makefile
View File

@ -4,8 +4,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-autoupdater PKG_NAME:=gluon-web-autoupdater
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-logging/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-logging PKG_NAME:=gluon-web-logging
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-mesh-vpn-fastd/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-mesh-vpn-fastd PKG_NAME:=gluon-web-mesh-vpn-fastd
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-web-model/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-model PKG_NAME:=gluon-web-model
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-network/Makefile
View File

@ -4,8 +4,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-network PKG_NAME:=gluon-web-network
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-web-node-role/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-node-role PKG_NAME:=gluon-web-node-role
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-web-osm/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-osm PKG_NAME:=gluon-web-osm
PKG_VERSION:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-private-wifi/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-private-wifi PKG_NAME:=gluon-web-private-wifi
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon-web-wifi-config/Makefile
View File

@ -1,8 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web-wifi-config PKG_NAME:=gluon-web-wifi-config
PKG_VERSION:=1
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

1
package/gluon-web/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-web PKG_NAME:=gluon-web
PKG_VERSION:=1
PKG_INSTALL:=1 PKG_INSTALL:=1

1
package/gluon-wireless-encryption/Makefile
View File

@ -1,7 +1,6 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=gluon-wireless-encryption PKG_NAME:=gluon-wireless-encryption
PKG_RELEASE:=1
include ../gluon.mk include ../gluon.mk

2
package/gluon.mk
View File

@ -1,6 +1,8 @@
GLUON_MK := $(abspath $(lastword $(MAKEFILE_LIST))) GLUON_MK := $(abspath $(lastword $(MAKEFILE_LIST)))
PKG_FILE_DEPENDS += $(GLUON_MK) PKG_FILE_DEPENDS += $(GLUON_MK)
PKG_VERSION ?= 1
PKG_BUILD_DEPENDS += luasrcdiet/host PKG_BUILD_DEPENDS += luasrcdiet/host
ifneq ($(wildcard ./luasrc/.),) ifneq ($(wildcard ./luasrc/.),)