diff options
| author | Jonas Gorski <jonas.gorski@gmail.com> | 2019-02-17 13:04:40 +0100 |
|---|---|---|
| committer | Jonas Gorski <jonas.gorski@gmail.com> | 2019-02-17 16:55:24 +0100 |
| commit | c8a30172f88f3df6d58dd3f67c5c12ef9472e979 (patch) | |
| tree | 69484ba9fb5a83cadfc834629204316f3dc4eef4 | |
| parent | 5b6997dcb39e46f2f2b43bbb694884c286bf193d (diff) | |
| download | upstream-c8a30172f88f3df6d58dd3f67c5c12ef9472e979.tar.gz upstream-c8a30172f88f3df6d58dd3f67c5c12ef9472e979.tar.bz2 upstream-c8a30172f88f3df6d58dd3f67c5c12ef9472e979.zip | |
dnsmasq: ensure test and rc order as older than final releases
Opkg treats text after a version number as higher than without:
~# opkg compare-versions "2.80rc1" "<<" "2.80"; echo $?
1
~# opkg compare-versions "2.80rc1" ">>" "2.80"; echo $?
0
This causes opkg not offering final release as upgradable version, and
even refusing to update, since it thinks the installed version is
higher.
This can be mitigated by adding ~ between the version and the text, as ~
will order as less than everything except itself. Since 'r' < 't', to
make sure that test will be treated as lower than rc we add a second ~
before the test tag. That way, the ordering becomes
2.80~~test < 2.80~rc < 2.80
which then makes opkg properly treat prerelease versions as lower.
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
| -rw-r--r-- | package/network/services/dnsmasq/Makefile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index d51f23e48b..59a4f45ca7 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dnsmasq -PKG_VERSION:=2.80 +PKG_UPSTREAM_VERSION:=2.80 +PKG_VERSION:=$(subst test,~~test,$(subst rc,~rc,$(PKG_UPSTREAM_VERSION))) PKG_RELEASE:=8 -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz +PKG_SOURCE:=$(PKG_NAME)-$(PKG_UPSTREAM_VERSION).tar.xz PKG_SOURCE_URL:=http://thekelleys.org.uk/dnsmasq PKG_HASH:=cdaba2785e92665cf090646cba6f94812760b9d7d8c8d0cfb07ac819377a63bb @@ -19,7 +20,7 @@ PKG_LICENSE:=GPL-2.0 PKG_LICENSE_FILES:=COPYING PKG_CPE_ID:=cpe:/a:thekelleys:dnsmasq -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_UPSTREAM_VERSION) PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 |