diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-07-23 01:04:35 +0200 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-07-23 10:54:33 +0200 |
| commit | 240793d1757e5105d6b9c85a9326674e0677cd70 (patch) | |
| tree | 5ce1126a7e7a639f383e1552dca6e82ac1615dcd | |
| parent | b057862e245444f447484149885ee3d8a001eeaa (diff) | |
| download | upstream-240793d1757e5105d6b9c85a9326674e0677cd70.tar.gz upstream-240793d1757e5105d6b9c85a9326674e0677cd70.tar.bz2 upstream-240793d1757e5105d6b9c85a9326674e0677cd70.zip | |
tools: drop PKG_VERSION for purely local packages
This applies to tools directory what has been done for package/ in
commit 9c170cb92f4f ("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. For tools/,
only three packages were affected. This fixes two of them, and
leaves the remaining wrt350nv2-builder untouched, as the code there
seems to have some versioning of its own that is treated as upstream
version in PKG_VERSION.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
| -rw-r--r-- | tools/missing-macros/Makefile | 2 | ||||
| -rw-r--r-- | tools/padjffs2/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/missing-macros/Makefile b/tools/missing-macros/Makefile index e4b69b3875..3d3ee4cbef 100644 --- a/tools/missing-macros/Makefile +++ b/tools/missing-macros/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=missing-macros -PKG_VERSION:=10 +PKG_RELEASE:=10 include $(INCLUDE_DIR)/host-build.mk diff --git a/tools/padjffs2/Makefile b/tools/padjffs2/Makefile index 0a583b8e1a..422d14db30 100644 --- a/tools/padjffs2/Makefile +++ b/tools/padjffs2/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=padjffs2 -PKG_VERSION:=1 +PKG_RELEASE:=1 include $(INCLUDE_DIR)/host-build.mk |