projects
/
openwrt
/
staging
/
rmilecki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nftables: implement no/json variants
[openwrt/staging/rmilecki.git]
/
package
/
network
/
utils
/
nftables
/
Makefile
diff --git
a/package/network/utils/nftables/Makefile
b/package/network/utils/nftables/Makefile
index 194119badcc88824fec878c52bb13bc6d9737f00..67906f8b7d75469250782e025265cff5f63bb484 100644
(file)
--- a/
package/network/utils/nftables/Makefile
+++ b/
package/network/utils/nftables/Makefile
@@
-7,38
+7,66
@@
include $(TOPDIR)/rules.mk
PKG_NAME:=nftables
include $(TOPDIR)/rules.mk
PKG_NAME:=nftables
-PKG_VERSION:=0.
4+2015-01-08
+PKG_VERSION:=0.
9.3
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_URL:=git://git.netfilter.org/nftables
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b3529cf43bba5c3c4cddefa7f5d0143d510fd3ec
-PKG_MAINTAINER:=Steven Barth <steven@midlink.org>
+PKG_SOURCE_URL:=https://netfilter.org/projects/$(PKG_NAME)/files
+PKG_HASH:=956b915ce2a7aeaff123e49006be7a0690a0964e96c062703181a36e2e5edb78
+PKG_MAINTAINER:=
PKG_LICENSE:=GPL-2.0
PKG_FIXUP:=autoreconf
PKG_LICENSE:=GPL-2.0
PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/package.mk
+DISABLE_NLS:=
+
CONFIGURE_ARGS += \
--disable-debug \
CONFIGURE_ARGS += \
--disable-debug \
+ --disable-man-doc \
--with-mini-gmp \
--without-cli \
--with-mini-gmp \
--without-cli \
+ --disable-python
-define Package/nftables
+define Package/nftables
/Default
SECTION:=net
CATEGORY:=Network
SUBMENU:=Firewall
SECTION:=net
CATEGORY:=Network
SUBMENU:=Firewall
- TITLE:=nftables
packet filtering
userspace utility
- DEPENDS:=+kmod-nft-core +
kmod-nft-nat +
libnftnl
+ TITLE:=nftables userspace utility
+ DEPENDS:=+kmod-nft-core +libnftnl
URL:=http://netfilter.org/projects/nftables/
URL:=http://netfilter.org/projects/nftables/
+ PROVIDES:=nftables
+endef
+
+define Package/nftables-nojson
+ $(Package/nftables/Default)
+ TITLE+= no JSON support
+ VARIANT:=nojson
+ DEFAULT_VARIANT:=1
endef
endef
-define Package/nftables/install
+define Package/nftables-json
+ $(Package/nftables/Default)
+ TITLE+= with JSON support
+ VARIANT:=json
+ DEPENDS+=+jansson
+endef
+
+ifeq ($(BUILD_VARIANT),json)
+ CONFIGURE_ARGS += --with-json
+endif
+
+define Package/nftables/install/Default
$(INSTALL_DIR) $(1)/usr/sbin
$(INSTALL_DIR) $(1)/usr/sbin
- $(CP) $(PKG_BUILD_DIR)/src/nft $(1)/usr/sbin/
+ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/nft $(1)/usr/sbin/
+ $(INSTALL_DIR) $(1)/usr/lib
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/
endef
endef
-$(eval $(call BuildPackage,nftables))
+Package/nftables-nojson/install = $(Package/nftables/install/Default)
+Package/nftables-json/install = $(Package/nftables/install/Default)
+
+$(eval $(call BuildPackage,nftables-nojson))
+$(eval $(call BuildPackage,nftables-json))