[PATCH 2/2] packages/fff: Only use PKG_RELEASE for our own packages

mail at adrianschmutzler.de mail at adrianschmutzler.de
So Jun 16 20:41:47 CEST 2019


Hallo,

 

ich kuck mal, vll. applie ich den dann später selbst.

 

Grüße

 

Adrian

 

From: franken-dev [mailto:franken-dev-bounces at freifunk.net] On Behalf Of Fabian Bläse
Sent: Sonntag, 16. Juni 2019 10:07
To: Adrian Schmutzler <freifunk at adrianschmutzler.de>; franken-dev at freifunk.net
Subject: Re: [PATCH 2/2] packages/fff: Only use PKG_RELEASE for our own packages

 

Hallo Adrian, 

lag zu lange rum, applied leider nicht mehr sauber.. :-( 
Lässt sich aber ohne weiteres reparieren: 
- Alles weg was bereits keine PKG_VERSION mehr hat 
- fff/Makefile auf PKG_RELEASE 6 und PKG_VERSION weg. 

Dafür braucht es denke ich keine v2. 

Reviewed-by: Fabian Bläse <fabian at blaese.de <mailto:fabian at blaese.de> > 

Fabian 

On 03.02.19 18:28, Adrian Schmutzler wrote: 
> PKG_VERSION is meant to refer to the version of external packages, 
> as we do e.g. in the tunneldigger package. 
> 
> For our own packages, we just need the PKG_RELEASE variable. 
> 
> Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de <mailto:freifunk at adrianschmutzler.de> > 
> 
> --- 
> 
> Wenn man durch die Änderungen geht, sieht man sehr schön, dass wir 
> ohnehin meistens nur eine der beiden Variablen inkrementiert haben, 
> wobei die Wahl der Variable sehr zufällig ist... 
> --- 
>  src/packages/fff/fff-alfred-monitoring-proxy/Makefile | 1 - 
>  src/packages/fff/fff-alfred/Makefile                  | 1 - 
>  src/packages/fff/fff-babeld/Makefile                  | 1 - 
>  src/packages/fff/fff-batman-adv-legacy/Makefile       | 1 - 
>  src/packages/fff/fff-batman-adv/Makefile              | 1 - 
>  src/packages/fff/fff-boardname/Makefile               | 3 +-- 
>  src/packages/fff/fff-config/Makefile                  | 1 - 
>  src/packages/fff/fff-dhcp/Makefile                    | 1 - 
>  src/packages/fff/fff-fastd/Makefile                   | 1 - 
>  src/packages/fff/fff-firewall/Makefile                | 3 +-- 
>  src/packages/fff/fff-hoods/Makefile                   | 3 +-- 
>  src/packages/fff/fff-hoodutils/Makefile               | 1 - 
>  src/packages/fff/fff-network/Makefile                 | 3 +-- 
>  src/packages/fff/fff-nodewatcher/Makefile             | 3 +-- 
>  src/packages/fff/fff-ra/Makefile                      | 1 - 
>  src/packages/fff/fff-random/Makefile                  | 3 +-- 
>  src/packages/fff/fff-support/Makefile                 | 1 - 
>  src/packages/fff/fff-sysupgrade/Makefile              | 3 +-- 
>  src/packages/fff/fff-timeserver/Makefile              | 3 +-- 
>  src/packages/fff/fff-tunneldigger/Makefile            | 1 - 
>  src/packages/fff/fff-uradvd/Makefile                  | 1 - 
>  src/packages/fff/fff-vpn-select/Makefile              | 3 +-- 
>  src/packages/fff/fff-web/Makefile                     | 3 +-- 
>  src/packages/fff/fff-wireless/Makefile                | 3 +-- 
>  src/packages/fff/fff/Makefile                         | 3 +-- 
>  25 files changed, 12 insertions(+), 37 deletions(-) 
> 
> diff --git a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile

> index a5be9962..5120947a 100644 
> --- a/src/packages/fff/fff-alfred-monitoring-proxy/Makefile 
> +++ b/src/packages/fff/fff-alfred-monitoring-proxy/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-alfred-monitoring-proxy 
> -PKG_VERSION:=0.0.1 
>  PKG_RELEASE:=2 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-alfred-monitoring-proxy 
> diff --git a/src/packages/fff/fff-alfred/Makefile b/src/packages/fff/fff-alfred/Makefile 
> index 53cf149e..06ab5fcf 100644 
> --- a/src/packages/fff/fff-alfred/Makefile 
> +++ b/src/packages/fff/fff-alfred/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-alfred 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-babeld/Makefile b/src/packages/fff/fff-babeld/Makefile 
> index bb15e3a7..29fd8e53 100644 
> --- a/src/packages/fff/fff-babeld/Makefile 
> +++ b/src/packages/fff/fff-babeld/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-babeld 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-babeld 
> diff --git a/src/packages/fff/fff-batman-adv-legacy/Makefile b/src/packages/fff/fff-batman-adv-legacy/Makefile 
> index 0164d247..7ff9f742 100644 
> --- a/src/packages/fff/fff-batman-adv-legacy/Makefile 
> +++ b/src/packages/fff/fff-batman-adv-legacy/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-batman-adv-legacy 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-batman-adv/Makefile b/src/packages/fff/fff-batman-adv/Makefile 
> index ccfef244..9ef58042 100644 
> --- a/src/packages/fff/fff-batman-adv/Makefile 
> +++ b/src/packages/fff/fff-batman-adv/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-batman-adv 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-boardname/Makefile b/src/packages/fff/fff-boardname/Makefile 
> index d274d888..42bf78e2 100644 
> --- a/src/packages/fff/fff-boardname/Makefile 
> +++ b/src/packages/fff/fff-boardname/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-boardname 
> -PKG_VERSION:=5 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=5 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-config/Makefile b/src/packages/fff/fff-config/Makefile 
> index 89bdc93d..10c7e02e 100644 
> --- a/src/packages/fff/fff-config/Makefile 
> +++ b/src/packages/fff/fff-config/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-config 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-dhcp/Makefile b/src/packages/fff/fff-dhcp/Makefile 
> index 8ea7e716..c481d827 100644 
> --- a/src/packages/fff/fff-dhcp/Makefile 
> +++ b/src/packages/fff/fff-dhcp/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-dhcp 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-dhcp 
> diff --git a/src/packages/fff/fff-fastd/Makefile b/src/packages/fff/fff-fastd/Makefile 
> index 1353f538..513775da 100644 
> --- a/src/packages/fff/fff-fastd/Makefile 
> +++ b/src/packages/fff/fff-fastd/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-fastd 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=2 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-firewall/Makefile b/src/packages/fff/fff-firewall/Makefile 
> index 5d56afb2..7bb82b17 100644 
> --- a/src/packages/fff/fff-firewall/Makefile 
> +++ b/src/packages/fff/fff-firewall/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-firewall 
> -PKG_VERSION:=3 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=3 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-hoods/Makefile b/src/packages/fff/fff-hoods/Makefile 
> index f1a62896..259e5fde 100644 
> --- a/src/packages/fff/fff-hoods/Makefile 
> +++ b/src/packages/fff/fff-hoods/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-hoods 
> -PKG_VERSION:=5 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=5 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-hoodutils/Makefile b/src/packages/fff/fff-hoodutils/Makefile 
> index 74773682..57e55b20 100644 
> --- a/src/packages/fff/fff-hoodutils/Makefile 
> +++ b/src/packages/fff/fff-hoodutils/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-hoodutils 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-network/Makefile b/src/packages/fff/fff-network/Makefile 
> index e9335884..8da3e54a 100644 
> --- a/src/packages/fff/fff-network/Makefile 
> +++ b/src/packages/fff/fff-network/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-network 
> -PKG_VERSION:=10 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=10 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-nodewatcher/Makefile b/src/packages/fff/fff-nodewatcher/Makefile 
> index eea86ae6..ab74f883 100644 
> --- a/src/packages/fff/fff-nodewatcher/Makefile 
> +++ b/src/packages/fff/fff-nodewatcher/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-nodewatcher 
> -PKG_VERSION:=51 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=51 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-ra/Makefile b/src/packages/fff/fff-ra/Makefile 
> index e17adf95..752647a9 100644 
> --- a/src/packages/fff/fff-ra/Makefile 
> +++ b/src/packages/fff/fff-ra/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-ra 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff-ra 
> diff --git a/src/packages/fff/fff-random/Makefile b/src/packages/fff/fff-random/Makefile 
> index 6239b52f..70e5f56b 100644 
> --- a/src/packages/fff/fff-random/Makefile 
> +++ b/src/packages/fff/fff-random/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-random 
> -PKG_VERSION:=2 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=2 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-support/Makefile b/src/packages/fff/fff-support/Makefile 
> index 73066adb..b8a8bb34 100644 
> --- a/src/packages/fff/fff-support/Makefile 
> +++ b/src/packages/fff/fff-support/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-support 
> -PKG_VERSION:=0.0.1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile 
> index 90ef66af..d03104a2 100644 
> --- a/src/packages/fff/fff-sysupgrade/Makefile 
> +++ b/src/packages/fff/fff-sysupgrade/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-sysupgrade 
> -PKG_VERSION:=9 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=9 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-timeserver/Makefile b/src/packages/fff/fff-timeserver/Makefile 
> index 5559da4d..94ae86ce 100644 
> --- a/src/packages/fff/fff-timeserver/Makefile 
> +++ b/src/packages/fff/fff-timeserver/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-timeserver 
> -PKG_VERSION:=2 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=2 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-tunneldigger/Makefile b/src/packages/fff/fff-tunneldigger/Makefile 
> index 2ee3998d..570266c2 100644 
> --- a/src/packages/fff/fff-tunneldigger/Makefile 
> +++ b/src/packages/fff/fff-tunneldigger/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-tunneldigger 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-uradvd/Makefile b/src/packages/fff/fff-uradvd/Makefile 
> index 5d093662..644f43dd 100644 
> --- a/src/packages/fff/fff-uradvd/Makefile 
> +++ b/src/packages/fff/fff-uradvd/Makefile 
> @@ -1,7 +1,6 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-uradvd 
> -PKG_VERSION:=1 
>  PKG_RELEASE:=1 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
> diff --git a/src/packages/fff/fff-vpn-select/Makefile b/src/packages/fff/fff-vpn-select/Makefile 
> index e91c6e2d..675edcc7 100644 
> --- a/src/packages/fff/fff-vpn-select/Makefile 
> +++ b/src/packages/fff/fff-vpn-select/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-vpn-select 
> -PKG_VERSION:=3 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=3 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-web/Makefile b/src/packages/fff/fff-web/Makefile 
> index 7a3c4e38..9bb10f71 100644 
> --- a/src/packages/fff/fff-web/Makefile 
> +++ b/src/packages/fff/fff-web/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-web 
> -PKG_VERSION:=6 
> -PKG_RELEASE:=2 
> +PKG_RELEASE:=7 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff-wireless/Makefile b/src/packages/fff/fff-wireless/Makefile 
> index 3bc1862b..a9bcf684 100644 
> --- a/src/packages/fff/fff-wireless/Makefile 
> +++ b/src/packages/fff/fff-wireless/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff-wireless 
> -PKG_VERSION:=6 
> -PKG_RELEASE:=1 
> +PKG_RELEASE:=6 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) 
>  
> diff --git a/src/packages/fff/fff/Makefile b/src/packages/fff/fff/Makefile 
> index 7d8009bd..2ed67724 100644 
> --- a/src/packages/fff/fff/Makefile 
> +++ b/src/packages/fff/fff/Makefile 
> @@ -1,8 +1,7 @@ 
>  include $(TOPDIR)/rules.mk 
>  
>  PKG_NAME:=fff 
> -PKG_VERSION:=0.0.2 
> -PKG_RELEASE:=4 
> +PKG_RELEASE:=5 
>  
>  PKG_BUILD_DIR:=$(BUILD_DIR)/fff 
>  
> 

 
-------------- nächster Teil --------------
Ein Dateianhang mit HTML-Daten wurde abgetrennt...
URL: <https://{'listname': 'franken-dev-freifunk.net', 'hostname': 'lists.freifunk.net'}/pipermail/franken-dev-freifunk.net/attachments/20190616/9917f7a9/attachment.html>
-------------- nächster Teil --------------
Ein Dateianhang mit Binärdaten wurde abgetrennt...
Dateiname   : openpgp-digital-signature.asc
Dateityp    : application/pgp-signature
Dateigröße  : 834 bytes
Beschreibung: nicht verfügbar
URL         : <https://{'listname': 'franken-dev-freifunk.net', 'hostname': 'lists.freifunk.net'}/pipermail/franken-dev-freifunk.net/attachments/20190616/9917f7a9/attachment.sig>


Mehr Informationen über die Mailingliste franken-dev