From 6f1313abd0b4579ade7b075e9df989e46f369880 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Sep 2014 16:06:23 +0300 Subject: [PATCH 1/6] openvswitch: move openvswitch-common/postinst after install Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index e607d0fe7..c918fbcab 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -163,11 +163,6 @@ define Package/openvswitch-common/install $(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/ @@ -182,6 +177,11 @@ define Package/openvswitch-switch/install $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/ endef +define Package/openvswitch-common/postinst +#!/bin/sh +[ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true +endef + $(eval $(call BuildPackage,openvswitch-ipsec)) $(eval $(call BuildPackage,openvswitch-common)) $(eval $(call BuildPackage,openvswitch-switch)) From aa35b343265c71db913b317d0686d71b425bdd3c Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Sep 2014 09:35:02 +0300 Subject: [PATCH 2/6] openvswitch: merge openvswitch-common + openvswitch-switch into openvswitch Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 34 +++++++++------------------------- 1 file changed, 9 insertions(+), 25 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index c918fbcab..1d0de1369 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -33,7 +33,6 @@ define Package/openvswitch/Default SECTION:=net CATEGORY:=Network URL:=http://www.openvswitchswitch.org/ - DEPENDS:=+libopenssl +librt +libpcap +libatomic MAINTAINER:=Alexandru Ardelean endef @@ -47,20 +46,20 @@ define Package/openvswitch/Default/description 1000V. endef -define Package/openvswitch-common +define Package/openvswitch $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package - DEPENDS:=+libpcap +libopenssl +librt +kmod-openvswitch + DEPENDS:=+libpcap +libopenssl +librt +libatomic +kmod-openvswitch endef -define Package/openvswitch-common/description - openvswitch-common provides components required by openvswitch-switch. +define Package/openvswitch/description + 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 + DEPENDS:=+openvswitch endef define Package/openvswitch-ipsec/description @@ -71,24 +70,13 @@ endef define Package/openvswitch-benchmark $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package - DEPENDS:=+openvswitch-common + DEPENDS:=+openvswitch endef define Package/openvswitch-benchmark/description Utility for running OpenVSwitch benchmarking 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 SECTION:=kernel CATEGORY:=Kernel modules @@ -145,7 +133,7 @@ define Package/openvswitch-benchmark/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-benchmark $(1)/usr/bin/ endef -define Package/openvswitch-common/install +define Package/openvswitch/install $(INSTALL_DIR) $(1)/etc/openvswitch $(INSTALL_DIR) $(1)/etc/init.d @@ -161,10 +149,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-ofctl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-client $(1)/usr/bin/ -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-vsctl $(1)/usr/bin/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-tool $(1)/usr/bin/ @@ -177,14 +162,13 @@ define Package/openvswitch-switch/install $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/ endef -define Package/openvswitch-common/postinst +define Package/openvswitch/postinst #!/bin/sh [ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true endef +$(eval $(call BuildPackage,openvswitch)) $(eval $(call BuildPackage,openvswitch-ipsec)) -$(eval $(call BuildPackage,openvswitch-common)) -$(eval $(call BuildPackage,openvswitch-switch)) $(eval $(call BuildPackage,openvswitch-benchmark)) $(eval $(call KernelPackage,openvswitch)) From 4940679ef2923f85bb2bc14bb9540b5fa80c8833 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Sep 2014 09:48:30 +0300 Subject: [PATCH 3/6] openvswitch: organize openvswitch-ipsec and openvswitch-benchmark as subpackages Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 1d0de1369..6a199f22f 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -59,7 +59,7 @@ endef define Package/openvswitch-ipsec $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package - DEPENDS:=+openvswitch + DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch endef define Package/openvswitch-ipsec/description @@ -70,7 +70,7 @@ endef define Package/openvswitch-benchmark $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package - DEPENDS:=+openvswitch + DEPENDS:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch endef define Package/openvswitch-benchmark/description From cf5fdf8a8fd4f55f549a482b00d0bd7d59806890 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Sep 2014 11:24:43 +0300 Subject: [PATCH 4/6] openvswitch: change order of the installs Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 6a199f22f..05a46510e 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -123,16 +123,6 @@ define Build/Compile KCC="$(KERNEL_CC)" endef -define Package/openvswitch-ipsec/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/install $(INSTALL_DIR) $(1)/etc/openvswitch @@ -162,6 +152,16 @@ define Package/openvswitch/install $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/ endef +define Package/openvswitch-ipsec/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/postinst #!/bin/sh [ -n "$${IPKG_INSTROOT}" ] || /etc/init.d/openvswitch enable || true From eaa0d56c03d133c27d943295eb712017ce9da5aa Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Sep 2014 10:28:41 +0300 Subject: [PATCH 5/6] openvswitch: fix package URL Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index 05a46510e..da4d2519d 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -32,7 +32,7 @@ PKG_FIXUP=libtool define Package/openvswitch/Default SECTION:=net CATEGORY:=Network - URL:=http://www.openvswitchswitch.org/ + URL:=http://openvswitch.org/ MAINTAINER:=Alexandru Ardelean endef From 2e1bfb6f266fc98699fa9ad442d36cf8eb7c762e Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Thu, 18 Sep 2014 17:09:19 +0300 Subject: [PATCH 6/6] openvswitch: remove openvswitch-package until python package is put back in Signed-off-by: Alexandru Ardelean --- net/openvswitch/Makefile | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/net/openvswitch/Makefile b/net/openvswitch/Makefile index da4d2519d..710e89845 100644 --- a/net/openvswitch/Makefile +++ b/net/openvswitch/Makefile @@ -56,17 +56,6 @@ define Package/openvswitch/description 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:=@PACKAGE_openvswitch +PACKAGE_openvswitch:openvswitch -endef - -define Package/openvswitch-ipsec/description - The ovs-monitor-ipsec script provides support for encrypting GRE tunnels with - IPsec. -endef - define Package/openvswitch-benchmark $(call Package/openvswitch/Default) TITLE:=Open vSwitch Userspace Package @@ -152,11 +141,6 @@ define Package/openvswitch/install $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/ endef -define Package/openvswitch-ipsec/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/ @@ -168,7 +152,6 @@ define Package/openvswitch/postinst endef $(eval $(call BuildPackage,openvswitch)) -$(eval $(call BuildPackage,openvswitch-ipsec)) $(eval $(call BuildPackage,openvswitch-benchmark)) $(eval $(call KernelPackage,openvswitch))