projects
/
openwrt
/
staging
/
chunkeey.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nftables: add CONFLICT between versions
[openwrt/staging/chunkeey.git]
/
package
/
network
/
utils
/
nftables
/
Makefile
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_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
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
TITLE+= no JSON support
VARIANT:=nojson
DEFAULT_VARIANT:=1
+ CONFLICTS:=nftables-json
endef
define Package/nftables-json
endef
define Package/nftables-json