[openwrt/openwrt] nftables: add CONFLICT between versions

LEDE Commits lede-commits at lists.infradead.org
Mon Apr 11 14:38:22 PDT 2022


hauke pushed a commit to openwrt/openwrt.git, branch openwrt-22.03:
https://git.openwrt.org/fb597a9d4ca85583999b4ff39dd00dbad20c753a

commit fb597a9d4ca85583999b4ff39dd00dbad20c753a
Author: Eneas U de Queiroz <cotequeiroz at gmail.com>
AuthorDate: Thu Apr 7 17:47:38 2022 -0300

    nftables: add CONFLICT between versions
    
    Have nftables-json conflict with nftables-nojson.
    
    Signed-off-by: Eneas U de Queiroz <cotequeiroz at gmail.com>
    (cherry picked from commit 1135b75d1fd26049a0644b304b7199e4a73c6a08)
---
 package/network/utils/nftables/Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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




More information about the lede-commits mailing list