aboutsummaryrefslogtreecommitdiffstats
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 21:41:03 +0200
commit1135b75d1fd26049a0644b304b7199e4a73c6a08 (patch)
tree05555ec6df1b92392c86f0a090095d318c573ce9
parente89f3e85eb1c1d81294e5d430a91b0ba625e2ec0 (diff)
downloadupstream-1135b75d1fd26049a0644b304b7199e4a73c6a08.tar.gz
upstream-1135b75d1fd26049a0644b304b7199e4a73c6a08.tar.bz2
upstream-1135b75d1fd26049a0644b304b7199e4a73c6a08.zip
nftables: add CONFLICT between versions
Have nftables-json conflict with nftables-nojson. Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
-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