projects
/
openwrt
/
staging
/
lynxis.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e89f3e8
)
nftables: add CONFLICT between versions
author
Eneas U de Queiroz
<cotequeiroz@gmail.com>
Thu, 7 Apr 2022 20:47:38 +0000
(17:47 -0300)
committer
Hauke Mehrtens
<hauke@hauke-m.de>
Mon, 11 Apr 2022 19:41:03 +0000
(21:41 +0200)
Have nftables-json conflict with nftables-nojson.
Signed-off-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
package/network/utils/nftables/Makefile
patch
|
blob
|
history
diff --git
a/package/network/utils/nftables/Makefile
b/package/network/utils/nftables/Makefile
index d1d120e5e9c095798003106bd2a7a6c6514af0b7..8f0fddaa0ea400a0da4ca03413d76c9dae45c25a 100644
(file)
--- 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