[openwrt/openwrt] package: drop PKG_VERSION for purely local packages

LEDE Commits lede-commits at lists.infradead.org
Wed Jul 15 12:34:17 EDT 2020 

adrian pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/9c170cb92f4fbb316592c11567a080eb3f6a1fc3

commit 9c170cb92f4fbb316592c11567a080eb3f6a1fc3
Author: Adrian Schmutzler <freifunk at adrianschmutzler.de>
AuthorDate: Mon Feb 24 16:57:38 2020 +0100

    package: drop PKG_VERSION for purely local packages
    
    In the package guidelines, PKG_VERSION is supposed to be used as
    "The upstream version number that we're downloading", while
    PKG_RELEASE is referred to as "The version of this package Makefile".
    Thus, the variables in a strict interpretation provide a clear
    distinction between "their" (upstream) version in PKG_VERSION and
    "our" (local OpenWrt trunk) version in PKG_RELEASE.
    
    For local (OpenWrt-only) packages, this implies that those will only
    need PKG_RELEASE defined, while PKG_VERSION does not apply following
    a strict interpretation. While the majority of "our" packages actually
    follow that scheme, there are also some that mix both variables or
    have one of them defined but keep them at "1".
    
    This is misleading and confusing, which can be observed by the fact
    that there typically either one of the variables is never bumped or
    the choice of the variable to increase depends on the person doing the
    change.
    
    Consequently, this patch aims at clarifying the situation by
    consistently using only PKG_RELEASE for "our" packages. To achieve
    that, PKG_VERSION is removed there, bumping PKG_RELEASE where
    necessary to ensure the resulting package version string is bigger
    than before.
    
    During adjustment, one has to make sure that the new resulting composite
    package version will not be considered "older" than the previous one.
    
    A useful tool for evaluating that is 'opkg compare-versions'. In
    principle, there are the following cases:
    
    1. Sole PKG_VERSION replaced by sole PKG_RELEASE:
       In this case, the resulting version string does not change, it's
       just the value of the variable put in the file. Consequently, we
       do not bump the number in these cases so nobody is tempted to
       install the same package again.
    
    2. PKG_VERSION and PKG_RELEASE replaced by sole PKG_RELEASE:
       In this case, the resulting version string has been "version-release",
       e.g. 1-3 or 1.0-3. For this case, the new PKG_RELEASE will just
       need to be higher than the previous PKG_VERSION.
       For the cases where PKG_VERSION has always sticked to "1", and
       PKG_RELEASE has been incremented, we take the most recent value of
       PKG_RELEASE.
    
    Apart from that, a few packages appear to have developed their own
    complex versioning scheme, e.g. using x.y.z number for PKG_VERSION
    _and_ a PKG_RELEASE (qos-scripts) or using dates for PKG_VERSION
    (adb-enablemodem, wwan). I didn't touch these few in this patch.
    
    Cc: Hans Dedecker <dedeckeh at gmail.com>
    Cc: Felix Fietkau <nbd at nbd.name>
    Cc: Andre Valentin <avalentin at marcant.net>
    Cc: Matthias Schiffer <mschiffer at universe-factory.net>
    Cc: Jo-Philipp Wich <jo at mein.io>
    Cc: Steven Barth <steven at midlink.org>
    Cc: Daniel Golle <dgolle at allnet.de>
    Cc: John Crispin <john at phrozen.org>
    
    Signed-off-by: Adrian Schmutzler <freifunk at adrianschmutzler.de>
---
 package/kernel/om-watchdog/Makefile     | 1 -
 package/kernel/trelay/Makefile          | 1 -
 package/network/config/gre/Makefile     | 1 -
 package/network/config/ipip/Makefile    | 1 -
 package/network/config/vti/Makefile     | 1 -
 package/network/config/xfrm/Makefile    | 1 -
 package/network/ipv6/464xlat/Makefile   | 2 +-
 package/network/ipv6/6in4/Makefile      | 3 +--
 package/network/ipv6/6rd/Makefile       | 3 +--
 package/network/ipv6/6to4/Makefile      | 3 +--
 package/network/ipv6/ds-lite/Makefile   | 3 +--
 package/network/ipv6/map/Makefile       | 3 +--
 package/network/utils/rssileds/Makefile | 3 +--
 package/system/urandom-seed/Makefile    | 1 -
 package/system/zram-swap/Makefile       | 3 +--
 15 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/package/kernel/om-watchdog/Makefile b/package/kernel/om-watchdog/Makefile
index 403069b816..a7e859dc8b 100644
--- a/package/kernel/om-watchdog/Makefile
+++ b/package/kernel/om-watchdog/Makefile
@@ -9,7 +9,6 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=om-watchdog
 PKG_RELEASE:=2
-PKG_VERSION:=1
 
 include $(INCLUDE_DIR)/package.mk
 
diff --git a/package/kernel/trelay/Makefile b/package/kernel/trelay/Makefile
index a6bada1a9b..ad83523cd4 100644
--- a/package/kernel/trelay/Makefile
+++ b/package/kernel/trelay/Makefile
@@ -9,7 +9,6 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=trelay
-PKG_VERSION:=0.1
 PKG_RELEASE:=2
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/config/gre/Makefile b/package/network/config/gre/Makefile
index ca19f5d47c..b16dd72cde 100644
--- a/package/network/config/gre/Makefile
+++ b/package/network/config/gre/Makefile
@@ -8,7 +8,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gre
-PKG_VERSION:=1
 PKG_RELEASE:=12
 PKG_LICENSE:=GPL-2.0
 
diff --git a/package/network/config/ipip/Makefile b/package/network/config/ipip/Makefile
index 458709038b..c262182558 100644
--- a/package/network/config/ipip/Makefile
+++ b/package/network/config/ipip/Makefile
@@ -8,7 +8,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ipip
-PKG_VERSION:=1
 PKG_RELEASE:=3
 PKG_LICENSE:=GPL-2.0
 
diff --git a/package/network/config/vti/Makefile b/package/network/config/vti/Makefile
index ee7c0d11e8..ffac77ab91 100644
--- a/package/network/config/vti/Makefile
+++ b/package/network/config/vti/Makefile
@@ -8,7 +8,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vti
-PKG_VERSION:=1
 PKG_RELEASE:=3
 PKG_LICENSE:=GPL-2.0
 
diff --git a/package/network/config/xfrm/Makefile b/package/network/config/xfrm/Makefile
index 1d0766f568..1b3b99adb0 100644
--- a/package/network/config/xfrm/Makefile
+++ b/package/network/config/xfrm/Makefile
@@ -2,7 +2,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xfrm
-PKG_VERSION:=1
 PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0
 
diff --git a/package/network/ipv6/464xlat/Makefile b/package/network/ipv6/464xlat/Makefile
index f4dce2e77d..c792323235 100644
--- a/package/network/ipv6/464xlat/Makefile
+++ b/package/network/ipv6/464xlat/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=464xlat
-PKG_VERSION:=12
+PKG_RELEASE:=12
 
 PKG_SOURCE_DATE:=2018-01-16
 PKG_MAINTAINER:=Hans Dedecker <dedeckeh at gmail.com>
diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile
index 8ff4730e74..08696ef7a8 100644
--- a/package/network/ipv6/6in4/Makefile
+++ b/package/network/ipv6/6in4/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6in4
-PKG_VERSION:=25
-PKG_RELEASE:=1
+PKG_RELEASE:=26
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile
index 47f20414fc..9836ae9361 100644
--- a/package/network/ipv6/6rd/Makefile
+++ b/package/network/ipv6/6rd/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6rd
-PKG_VERSION:=9
-PKG_RELEASE:=4
+PKG_RELEASE:=10
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/6to4/Makefile b/package/network/ipv6/6to4/Makefile
index 32d7b325aa..dfb66aaae2 100644
--- a/package/network/ipv6/6to4/Makefile
+++ b/package/network/ipv6/6to4/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=6to4
-PKG_VERSION:=12
-PKG_RELEASE:=2
+PKG_RELEASE:=13
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile
index 198b6ebcc7..502da366a9 100644
--- a/package/network/ipv6/ds-lite/Makefile
+++ b/package/network/ipv6/ds-lite/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ds-lite
-PKG_VERSION:=7
-PKG_RELEASE:=4
+PKG_RELEASE:=8
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile
index f05f216a4c..5d0e0bbd3d 100644
--- a/package/network/ipv6/map/Makefile
+++ b/package/network/ipv6/map/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map
-PKG_VERSION:=4
-PKG_RELEASE:=13
+PKG_RELEASE:=5
 PKG_LICENSE:=GPL-2.0
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/network/utils/rssileds/Makefile b/package/network/utils/rssileds/Makefile
index 7a59314693..892b9f2c51 100644
--- a/package/network/utils/rssileds/Makefile
+++ b/package/network/utils/rssileds/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rssileds
-PKG_VERSION:=0.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 PKG_LICNESE:=GPL-2.0+
 
 include $(INCLUDE_DIR)/package.mk
diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile
index 5a48a07ce1..7cb7c72038 100644
--- a/package/system/urandom-seed/Makefile
+++ b/package/system/urandom-seed/Makefile
@@ -1,7 +1,6 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=urandom-seed
-PKG_VERSION:=1.0
 PKG_RELEASE:=2
 PKG_LICENSE:=GPL-2.0-only
 
diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile
index a6661ce5e9..4422c351ea 100644
--- a/package/system/zram-swap/Makefile
+++ b/package/system/zram-swap/Makefile
@@ -8,8 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=zram-swap
-PKG_VERSION:=1.1
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)

More information about the lede-commits mailing list