[source] ipset: split libipset as a subpackage
LEDE Commits
lede-commits at lists.infradead.org
Fri Jul 21 06:14:40 PDT 2017
stintel pushed a commit to source.git, branch master:
https://git.lede-project.org/d9f7ae6cdbf798e51bbefc2352b6e9206edefa50
commit d9f7ae6cdbf798e51bbefc2352b6e9206edefa50
Author: Alexandru Ardelean <ardeleanalex at gmail.com>
AuthorDate: Tue Jun 20 15:18:11 2017 +0300
ipset: split libipset as a subpackage
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 at gmail.com>
---
package/network/utils/ipset/Makefile | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/package/network/utils/ipset/Makefile b/package/network/utils/ipset/Makefile
index f44c1de..66a9874 100644
--- a/package/network/utils/ipset/Makefile
+++ b/package/network/utils/ipset/Makefile
@@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ipset
PKG_VERSION:=6.32
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://ipset.netfilter.org
@@ -24,7 +24,7 @@ PKG_INSTALL:=1
include $(INCLUDE_DIR)/package.mk
-define Package/ipset
+define Package/ipset/Default
SECTION:=net
CATEGORY:=Network
DEPENDS+= +kmod-ipt-ipset +libmnl
@@ -32,6 +32,15 @@ define Package/ipset
URL:=http://ipset.netfilter.org/
endef
+define Package/ipset
+$(call Package/ipset/Default)
+ DEPENDS+= +libipset
+endef
+
+define Package/libipset
+$(call Package/ipset/Default)
+endef
+
CONFIGURE_ARGS += \
--with-kbuild="$(LINUX_DIR)"
@@ -39,10 +48,6 @@ MAKE_FLAGS += \
ARCH="$(LINUX_KARCH)" \
SHELL="$(BASH)"
-define Build/Compile
- $(call Build/Compile/Default)
-endef
-
define Build/InstallDev
$(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/include/libipset $(1)/usr/include/
@@ -53,8 +58,12 @@ endef
define Package/ipset/install
$(INSTALL_DIR) $(1)/usr/sbin
$(CP) $(PKG_INSTALL_DIR)/usr/sbin/ipset $(1)/usr/sbin/
+endef
+
+define Package/libipset/install
$(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/
endef
$(eval $(call BuildPackage,ipset))
+$(eval $(call BuildPackage,libipset))
More information about the lede-commits
mailing list