EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ipset: split libipset as a subpackage

Browse Source 
Intent is to link against it, and have the option to
not install the ipset utility (if needed).

One example/use-case is keepalived (from package)
feeds, where it would be nice to just depend on a
`libipset` (sub)package.

Signed-off-by: Alexandru Ardelean <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2017-06-20 15:18:11 +03:00 committed by Stijn Tintel
parent 4c1ce83548
commit d9f7ae6cdb
1 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
package/network/utils/ipset/Makefile
View File

@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ipset PKG_NAME:=ipset
PKG_VERSION:=6.32 PKG_VERSION:=6.32
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ipset.netfilter.org PKG_SOURCE_URL:=http://ipset.netfilter.org
@ -24,7 +24,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/ipset define Package/ipset/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS+= +kmod-ipt-ipset +libmnl DEPENDS+= +kmod-ipt-ipset +libmnl
@ -32,6 +32,15 @@ define Package/ipset
URL:=http://ipset.netfilter.org/ URL:=http://ipset.netfilter.org/
endef endef
define Package/ipset
$(call Package/ipset/Default)
DEPENDS+= +libipset
endef
define Package/libipset
$(call Package/ipset/Default)
endef
CONFIGURE_ARGS += \ CONFIGURE_ARGS += \
--with-kbuild="$(LINUX_DIR)" --with-kbuild="$(LINUX_DIR)"
@ -39,10 +48,6 @@ MAKE_FLAGS += \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
SHELL="$(BASH)" SHELL="$(BASH)"
define Build/Compile
$(call Build/Compile/Default)
endef
define Build/InstallDev define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/include/libipset $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/libipset $(1)/usr/include/
@ -53,8 +58,12 @@ endef
define Package/ipset/install define Package/ipset/install
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/ $(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/
endef
define Package/libipset/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/
endef endef
$(eval $(call BuildPackage,ipset)) $(eval $(call BuildPackage,ipset))
$(eval $(call BuildPackage,libipset))