aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorEneas U de Queiroz <cotequeiroz@gmail.com>2022-04-07 17:47:38 -0300
committerHauke Mehrtens <hauke@hauke-m.de>2022-04-11 22:45:16 +0200
commitfb597a9d4ca85583999b4ff39dd00dbad20c753a (patch)
tree50a2446c10ebd3b1ecea8ebff238cdb1ce6d8d8d /package/network
parent706c7706a35a196d8954ee7332c5a13723df9f68 (diff)
downloadupstream-fb597a9d4ca85583999b4ff39dd00dbad20c753a.tar.gz
upstream-fb597a9d4ca85583999b4ff39dd00dbad20c753a.tar.bz2
upstream-fb597a9d4ca85583999b4ff39dd00dbad20c753a.zip
nftables: add CONFLICT between versions
Have nftables-json conflict with nftables-nojson. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com> (cherry picked from commit 1135b75d1fd26049a0644b304b7199e4a73c6a08)
Diffstat (limited to 'package/network')
-rw-r--r--package/network/utils/nftables/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/package/network/utils/nftables/Makefile b/package/network/utils/nftables/Makefile
index d1d120e5e9..8f0fddaa0e 100644
--- a/package/network/utils/nftables/Makefile
+++ b/package/network/utils/nftables/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=nftables
PKG_VERSION:=1.0.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
@@ -45,6 +45,7 @@ define Package/nftables-nojson
TITLE+= no JSON support
VARIANT:=nojson
DEFAULT_VARIANT:=1
+ CONFLICTS:=nftables-json
endef
define Package/nftables-json