From: Eneas U de Queiroz <cotequeiroz@gmail.com>
Date: Thu, 7 Apr 2022 20:47:38 +0000 (-0300)
Subject: nftables: add CONFLICT between versions
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=1135b75d1fd26049a0644b304b7199e4a73c6a08;p=openwrt%2Fstaging%2Fblocktrron.git

nftables: add CONFLICT between versions

Have nftables-json conflict with nftables-nojson.

Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
---

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