Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #323 from commodo/master

Browse source 
openvswitch: cleanup and updates
This commit is contained in:
sbyx 2014-09-18 17:51:57 +02:00
commit 514587f1ae
1 changed files with 18 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
net/openvswitch/Makefile
View file

@ -32,8 +32,7 @@ PKG_FIXUP=libtool
define Package/openvswitch/Default define Package/openvswitch/Default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
URL:=http://www.openvswitchswitch.org/ URL:=http://openvswitch.org/
DEPENDS:=+libopenssl +librt +libpcap +libatomic
MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com> MAINTAINER:=Alexandru Ardelean <ardeleanalex@gmail.com>
endef endef
@ -47,48 +46,26 @@ define Package/openvswitch/Default/description
1000V. 1000V.
endef endef
define Package/openvswitch-common define Package/openvswitch
$(call Package/openvswitch/Default) $(call Package/openvswitch/Default)
TITLE:=Open vSwitch Userspace Package TITLE:=Open vSwitch Userspace Package
DEPENDS:=+libpcap +libopenssl +librt +kmod-openvswitch DEPENDS:=+libpcap +libopenssl +librt +libatomic +kmod-openvswitch
endef endef
define Package/openvswitch-common/description define Package/openvswitch/description
openvswitch-common provides components required by openvswitch-switch. Provides the main userspace components required for Open vSwitch to function.
endef
define Package/openvswitch-ipsec
$(call Package/openvswitch/Default)
TITLE:=Open vSwitch Userspace Package
DEPENDS:=+openvswitch-common
endef
define Package/openvswitch-ipsec/description
The ovs-monitor-ipsec script provides support for encrypting GRE tunnels with
IPsec.
endef endef
define Package/openvswitch-benchmark define Package/openvswitch-benchmark
$(call Package/openvswitch/Default) $(call Package/openvswitch/Default)
TITLE:=Open vSwitch Userspace Package TITLE:=Open vSwitch Userspace Package
DEPENDS:=+openvswitch-common DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch
endef endef
define Package/openvswitch-benchmark/description define Package/openvswitch-benchmark/description
Utility for running OpenVSwitch benchmarking Utility for running OpenVSwitch benchmarking
endef endef
define Package/openvswitch-switch
$(call Package/openvswitch/Default)
TITLE:=Open vSwitch Userspace Package
DEPENDS:=+openvswitch-common
endef
define Package/openvswitch-switch/description
openvswitch-switch provides the userspace components and utilities for the
Open vSwitch kernel-based switch.
endef
define KernelPackage/openvswitch define KernelPackage/openvswitch
SECTION:=kernel SECTION:=kernel
CATEGORY:=Kernel modules CATEGORY:=Kernel modules
@ -135,17 +112,7 @@ define Build/Compile
KCC="$(KERNEL_CC)" KCC="$(KERNEL_CC)"
endef endef
define Package/openvswitch-ipsec/install define Package/openvswitch/install
$(INSTALL_DIR) $(1)/usr/sbin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/debian/ovs-monitor-ipsec $(1)/usr/sbin/
endef
define Package/openvswitch-benchmark/install
$(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-benchmark $(1)/usr/bin/
endef
define Package/openvswitch-common/install
$(INSTALL_DIR) $(1)/etc/openvswitch $(INSTALL_DIR) $(1)/etc/openvswitch
$(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_DIR) $(1)/etc/init.d
@ -161,15 +128,7 @@ define Package/openvswitch-common/install
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-appctl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-appctl $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-ofctl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-ofctl $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-client $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-client $(1)/usr/bin/
endef
define Package/openvswitch-common/postinst
#!/bin/sh
[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true
endef
define Package/openvswitch-switch/install
$(INSTALL_DIR) $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-dpctl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-dpctl $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-vsctl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-vsctl $(1)/usr/bin/
$(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-tool $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-tool $(1)/usr/bin/
@ -182,9 +141,17 @@ define Package/openvswitch-switch/install
$(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/ $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/
endef endef
$(eval $(call BuildPackage,openvswitch-ipsec)) define Package/openvswitch-benchmark/install
$(eval $(call BuildPackage,openvswitch-common)) $(INSTALL_DIR) $(1)/usr/bin/
$(eval $(call BuildPackage,openvswitch-switch)) $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-benchmark $(1)/usr/bin/
endef
define Package/openvswitch/postinst
#!/bin/sh
[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true
endef
$(eval $(call BuildPackage,openvswitch))
$(eval $(call BuildPackage,openvswitch-benchmark)) $(eval $(call BuildPackage,openvswitch-benchmark))
$(eval $(call KernelPackage,openvswitch)) $(eval $(call KernelPackage,openvswitch))