| Message ID | 20200224160818.34303-1-freifunk@adrianschmutzler.de |
|---|---|
| State | Accepted |
| Delegated to: | Adrian Schmutzler |
| Headers | show |
| Series | [OpenWrt-Devel] package: use PKG_VERSION only for upstream packages | expand |
On Mon, Feb 24, 2020 at 05:08:18PM +0100, Adrian Schmutzler wrote: > 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. Not sure, but I guess this may bring problems when people do opkg show-upgradable as removing PKG_VERSION may then result in the package manager considering it a downgrade...? I haven't tried nor looked into it in detail though. Cheers Daniel > > Cc: Hans Dedecker <dedeckeh@gmail.com> > Cc: Felix Fietkau <nbd@nbd.name> > Cc: Andre Valentin <avalentin@marcant.net> > Cc: Matthias Schiffer <mschiffer@universe-factory.net> > Cc: Jo-Philipp Wich <jo@mein.io> > Cc: Steven Barth <steven@midlink.org> > Cc: Daniel Golle <dgolle@allnet.de> > Cc: John Crispin <john@phrozen.org> > > Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > --- > package/kernel/om-watchdog/Makefile | 1 - > package/network/config/gre/Makefile | 1 - > package/network/config/ipip/Makefile | 1 - > package/network/config/qos-scripts/Makefile | 3 +-- > package/network/config/vti/Makefile | 1 - > package/network/config/vxlan/Makefile | 2 +- > 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 | 1 - > package/network/utils/wwan/Makefile | 3 +-- > package/system/urandom-seed/Makefile | 3 +-- > package/system/zram-swap/Makefile | 3 +-- > 17 files changed, 11 insertions(+), 26 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/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/qos-scripts/Makefile b/package/network/config/qos-scripts/Makefile > index abaeaeb981..85b221b4b3 100644 > --- a/package/network/config/qos-scripts/Makefile > +++ b/package/network/config/qos-scripts/Makefile > @@ -8,8 +8,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=qos-scripts > -PKG_VERSION:=1.3.1 > -PKG_RELEASE:=1 > +PKG_RELEASE:=1.3.1 > PKG_LICENSE:=GPL-2.0 > > PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> > 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/vxlan/Makefile b/package/network/config/vxlan/Makefile > index 5850c443e7..82ff867fbd 100644 > --- a/package/network/config/vxlan/Makefile > +++ b/package/network/config/vxlan/Makefile > @@ -1,7 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=vxlan > -PKG_VERSION:=2 > +PKG_RELEASE:=2 > PKG_LICENSE:=GPL-2.0 > > include $(INCLUDE_DIR)/package.mk > 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@gmail.com> > diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile > index 8ff4730e74..da0aeeb3ba 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:=25 > 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..2444ecc283 100644 > --- a/package/network/utils/rssileds/Makefile > +++ b/package/network/utils/rssileds/Makefile > @@ -8,7 +8,6 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=rssileds > -PKG_VERSION:=0.2 > PKG_RELEASE:=2 > PKG_LICNESE:=GPL-2.0+ > > diff --git a/package/network/utils/wwan/Makefile b/package/network/utils/wwan/Makefile > index bb829b5e2c..9834354e2e 100644 > --- a/package/network/utils/wwan/Makefile > +++ b/package/network/utils/wwan/Makefile > @@ -1,8 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=wwan > -PKG_VERSION:=2019-04-29 > -PKG_RELEASE=4 > +PKG_RELEASE:=5 > > PKG_LICENSE:=GPL-2.0 > PKG_LICENSE_FILES:= > diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile > index aa13765a52..d86add9e1b 100644 > --- a/package/system/urandom-seed/Makefile > +++ b/package/system/urandom-seed/Makefile > @@ -1,8 +1,7 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=urandom-seed > -PKG_VERSION:=1.0 > -PKG_RELEASE:=1 > +PKG_RELEASE:=2 > PKG_LICENSE:=GPL-2.0 > > PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) > diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile > index ee5e85927f..ddc71abfe5 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) > > -- > 2.20.1 > > > _______________________________________________ > openwrt-devel mailing list > openwrt-devel@lists.openwrt.org > https://lists.openwrt.org/mailman/listinfo/openwrt-devel
Hi Daniel, > -----Original Message----- > From: Daniel Golle [mailto:daniel@makrotopia.org] > Sent: Montag, 24. Februar 2020 17:43 > To: Adrian Schmutzler <freifunk@adrianschmutzler.de> > Cc: openwrt-devel@lists.openwrt.org; Hans Dedecker <dedeckeh@gmail.com>; > Jo-Philipp Wich <jo@mein.io>; Andre Valentin <avalentin@marcant.net>; Daniel > Golle <dgolle@allnet.de>; John Crispin <john@phrozen.org>; Matthias Schiffer > <mschiffer@universe-factory.net>; Steven Barth <steven@midlink.org>; Felix > Fietkau <nbd@nbd.name> > Subject: Re: [OpenWrt-Devel] [PATCH] package: use PKG_VERSION only for > upstream packages > > On Mon, Feb 24, 2020 at 05:08:18PM +0100, Adrian Schmutzler wrote: > > 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. > > Not sure, but I guess this may bring problems when people do > opkg show-upgradable > as removing PKG_VERSION may then result in the package manager > considering it a downgrade...? > > I haven't tried nor looked into it in detail though. Thanks for your feedback. This might actually be the only big problem I see, too, and I also have not tested it yet (but I plan to do so). I do not plan to merge this fast, but rather wanted to bring this on the table for discussion (so I do not waste time on testing details in case somebody NAKs it right away). Best Adrian
Op 24 feb. 2020, om 17:08 heeft Adrian Schmutzler <freifunk@adrianschmutzler.de> het volgende geschreven: > > 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. As still some discussion exists about how to use PKG_VERSION and PKG_RELEASE, currently around local projects, a thought of some time ago might be worth consideration. The wiki states that PKG_RELEASE must be reset to 1 whenever PKG_VERSION is updated [1], which makes it subordinate to the upstream version of the package. Would just keep incrementing PKG_RELEASE not be less entangled (of orthogonal purposes) ? Also, might it be an idea to rename PKG_VERSION to PKG_UPSTREAM_VERSION ? (or something alike but more concise) That would make its meaning much more obvious. [1] https://openwrt.org/docs/guide-developer/package-policies
> -----Original Message----- > From: Paul Oranje [mailto:por@oranjevos.nl] > Sent: Sonntag, 9. August 2020 11:02 > To: Adrian Schmutzler <freifunk@adrianschmutzler.de> > Cc: OpenWrt Development List <openwrt-devel@lists.openwrt.org> > Subject: Re: [OpenWrt-Devel] [PATCH] package: use PKG_VERSION only for > upstream packages > > Op 24 feb. 2020, om 17:08 heeft Adrian Schmutzler > <freifunk@adrianschmutzler.de> het volgende geschreven: > > > > 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. > > As still some discussion exists about how to use PKG_VERSION and > PKG_RELEASE, currently around local projects, a thought of some time ago > might be worth consideration. > > The wiki states that PKG_RELEASE must be reset to 1 whenever > PKG_VERSION is updated [1], which makes it subordinate to the upstream > version of the package. Would just keep incrementing PKG_RELEASE not be > less entangled (of orthogonal purposes) ? I personally think the current solution of resetting PKG_RELEASE is more helpful. Having PKG_RELEASE orthogonal would establish two parallel versions of the same package, an internal and an external one. IMO this would just create more confusion. > > Also, might it be an idea to rename PKG_VERSION to > PKG_UPSTREAM_VERSION ? (or something alike but more concise) That > would make its meaning much more obvious. We already have PKG_SOURCE_VERSION, which however describes the commit hash. Therefore, I think going anywhere close to that with the current PKG_VERSION variable name again would just increase confusion, and not reduce it. Apart from that, changing PKG_VERSION variable name would be a major PITA considering how abundant and widely distributed it is. I'd only do that for a very, very good reason. Essentially, I personally think the two variables are actually fair to handle and understand if you care and read the guidelines. And with the multitude of variables for BuildPackage to cover all the cases in place, I don't think we will be able to get a solution which can be understood without looking at the docs at all anyway. So, we should just keep it as is IMO. Best Adrian > > [1] https://openwrt.org/docs/guide-developer/package-policies >
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/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/qos-scripts/Makefile b/package/network/config/qos-scripts/Makefile index abaeaeb981..85b221b4b3 100644 --- a/package/network/config/qos-scripts/Makefile +++ b/package/network/config/qos-scripts/Makefile @@ -8,8 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=qos-scripts -PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 +PKG_RELEASE:=1.3.1 PKG_LICENSE:=GPL-2.0 PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name> 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/vxlan/Makefile b/package/network/config/vxlan/Makefile index 5850c443e7..82ff867fbd 100644 --- a/package/network/config/vxlan/Makefile +++ b/package/network/config/vxlan/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vxlan -PKG_VERSION:=2 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 include $(INCLUDE_DIR)/package.mk 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@gmail.com> diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index 8ff4730e74..da0aeeb3ba 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:=25 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..2444ecc283 100644 --- a/package/network/utils/rssileds/Makefile +++ b/package/network/utils/rssileds/Makefile @@ -8,7 +8,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rssileds -PKG_VERSION:=0.2 PKG_RELEASE:=2 PKG_LICNESE:=GPL-2.0+ diff --git a/package/network/utils/wwan/Makefile b/package/network/utils/wwan/Makefile index bb829b5e2c..9834354e2e 100644 --- a/package/network/utils/wwan/Makefile +++ b/package/network/utils/wwan/Makefile @@ -1,8 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwan -PKG_VERSION:=2019-04-29 -PKG_RELEASE=4 +PKG_RELEASE:=5 PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:= diff --git a/package/system/urandom-seed/Makefile b/package/system/urandom-seed/Makefile index aa13765a52..d86add9e1b 100644 --- a/package/system/urandom-seed/Makefile +++ b/package/system/urandom-seed/Makefile @@ -1,8 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=urandom-seed -PKG_VERSION:=1.0 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_LICENSE:=GPL-2.0 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/package/system/zram-swap/Makefile b/package/system/zram-swap/Makefile index ee5e85927f..ddc71abfe5 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)
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. Cc: Hans Dedecker <dedeckeh@gmail.com> Cc: Felix Fietkau <nbd@nbd.name> Cc: Andre Valentin <avalentin@marcant.net> Cc: Matthias Schiffer <mschiffer@universe-factory.net> Cc: Jo-Philipp Wich <jo@mein.io> Cc: Steven Barth <steven@midlink.org> Cc: Daniel Golle <dgolle@allnet.de> Cc: John Crispin <john@phrozen.org> Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> --- package/kernel/om-watchdog/Makefile | 1 - package/network/config/gre/Makefile | 1 - package/network/config/ipip/Makefile | 1 - package/network/config/qos-scripts/Makefile | 3 +-- package/network/config/vti/Makefile | 1 - package/network/config/vxlan/Makefile | 2 +- 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 | 1 - package/network/utils/wwan/Makefile | 3 +-- package/system/urandom-seed/Makefile | 3 +-- package/system/zram-swap/Makefile | 3 +-- 17 files changed, 11 insertions(+), 26 deletions(-)