|
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/kernel.mk
|
12
|
12
|
|
13
|
13
|
PKG_NAME:=openvswitch
|
14
|
14
|
|
15
|
|
-PKG_RELEASE:=3
|
|
15
|
+PKG_RELEASE:=4
|
16
|
16
|
PKG_VERSION:=2.5.0
|
17
|
17
|
PKG_RELEASE=$(PKG_SOURCE_VERSION)
|
18
|
18
|
PKG_LICENSE:=Apache-2.0
|
|
@@ -129,31 +129,30 @@ define Package/openvswitch/install
|
129
|
129
|
$(INSTALL_BIN) ./files/etc/init.d/openvswitch.init $(1)/etc/init.d/openvswitch
|
130
|
130
|
|
131
|
131
|
$(INSTALL_DIR) $(1)/usr/lib/
|
132
|
|
- $(CP) $(PKG_BUILD_DIR)/lib/.libs/libsflow.so* $(1)/usr/lib/
|
133
|
|
- $(CP) $(PKG_BUILD_DIR)/lib/.libs/libopenvswitch.so* $(1)/usr/lib/
|
134
|
|
- $(CP) $(PKG_BUILD_DIR)/ofproto/.libs/libofproto.so* $(1)/usr/lib/
|
135
|
|
- $(CP) $(PKG_BUILD_DIR)/ovsdb/.libs/libovsdb.so* $(1)/usr/lib/
|
|
132
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libofproto.so* $(1)/usr/lib/
|
|
133
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libopenvswitch.so* $(1)/usr/lib/
|
|
134
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libovsdb.so* $(1)/usr/lib/
|
|
135
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsflow.so* $(1)/usr/lib/
|
136
|
136
|
|
137
|
137
|
$(INSTALL_DIR) $(1)/usr/bin/
|
138
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-appctl $(1)/usr/bin/
|
139
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-ofctl $(1)/usr/bin/
|
140
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-client $(1)/usr/bin/
|
141
|
|
-
|
142
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-dpctl $(1)/usr/bin/
|
143
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-vsctl $(1)/usr/bin/
|
144
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-tool $(1)/usr/bin/
|
|
138
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovs-appctl $(1)/usr/bin/
|
|
139
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovs-ofctl $(1)/usr/bin/
|
|
140
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovsdb-client $(1)/usr/bin/
|
|
141
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovs-dpctl $(1)/usr/bin/
|
|
142
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovs-vsctl $(1)/usr/bin/
|
|
143
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovsdb-tool $(1)/usr/bin/
|
145
|
144
|
|
146
|
145
|
$(INSTALL_DIR) $(1)/usr/sbin/
|
147
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/vswitchd/.libs/ovs-vswitchd $(1)/usr/sbin/
|
148
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/ovsdb/.libs/ovsdb-server $(1)/usr/sbin/
|
|
146
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ovs-vswitchd $(1)/usr/sbin/
|
|
147
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/ovsdb-server $(1)/usr/sbin/
|
149
|
148
|
|
150
|
149
|
$(INSTALL_DIR) $(1)/usr/share/openvswitch/
|
151
|
|
- $(INSTALL_CONF) $(PKG_BUILD_DIR)/vswitchd/vswitch.ovsschema $(1)/usr/share/openvswitch/
|
|
150
|
+ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/usr/share/openvswitch/vswitch.ovsschema $(1)/usr/share/openvswitch/
|
152
|
151
|
endef
|
153
|
152
|
|
154
|
153
|
define Package/openvswitch-python/install
|
155
|
|
- $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/
|
156
|
|
- $(CP) $(PKG_BUILD_DIR)/python/ovs/ $(1)/usr/lib/python$(PYTHON_VERSION)/
|
|
154
|
+ $(INSTALL_DIR) $(1)/usr/lib/python$(PYTHON_VERSION)/ovs
|
|
155
|
+ $(CP) $(PKG_INSTALL_DIR)/usr/share/openvswitch/python/ovs/* $(1)/usr/lib/python$(PYTHON_VERSION)/ovs
|
157
|
156
|
endef
|
158
|
157
|
|
159
|
158
|
define Package/openvswitch-ipsec/install
|
|
@@ -163,7 +162,7 @@ endef
|
163
|
162
|
|
164
|
163
|
define Package/openvswitch-benchmark/install
|
165
|
164
|
$(INSTALL_DIR) $(1)/usr/bin/
|
166
|
|
- $(INSTALL_BIN) $(PKG_BUILD_DIR)/utilities/.libs/ovs-benchmark $(1)/usr/bin/
|
|
165
|
+ $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ovs-benchmark $(1)/usr/bin/
|
167
|
166
|
endef
|
168
|
167
|
|
169
|
168
|
define Package/openvswitch/postinst
|