24
24
25
25
# Building the cnivpp subfolder requires VPP to be installed, or at least a
26
26
# handful of files in the proper installed location. VPPINSTALLED indicates
27
- # if required VPP files are installed.
27
+ # if required VPP files are installed.
28
28
# For 'make clean', VPPLCLINSTALLED indicates if 'make install' installed
29
29
# the minimum set of files or if VPP is actually installed.
30
30
ifeq ($(shell test -e $(VPPLIBDIR ) /libvppapiclient.so && echo -n yes) ,yes)
39
39
VPPLCLINSTALLED=0
40
40
endif
41
41
42
- #
43
- # OVS Variables
44
- #
45
- ifeq ($(shell test -e /usr/share/openvswitch/scripts/ovs-config.py && echo -n yes) ,yes)
46
- OVS_PY_INSTALLED =1
47
- else
48
- OVS_PY_INSTALLED =0
49
- endif
50
-
51
42
52
43
# Default to build
53
44
default : build
@@ -147,11 +138,6 @@ endif
147
138
@echo Installed /usr/share/vpp/api/*.json
148
139
@rm -rf tmpvpp
149
140
endif
150
- ifeq ($(OVS_PY_INSTALLED ) ,0)
151
- @echo OVS Python Script not installed. Installing now.
152
- @$(SUDO) -E mkdir -p /usr/share/openvswitch/scripts/
153
- @$(SUDO) -E cp ./cniovs/scripts/ovs-config.py /usr/share/openvswitch/scripts/.
154
- endif
155
141
156
142
157
143
extras :
@@ -166,7 +152,7 @@ clean:
166
152
@rm -f cnivpp/test/memifAddDel/memifAddDel
167
153
@rm -f cnivpp/test/vhostUserAddDel/vhostUserAddDel
168
154
@rm -f cnivpp/test/ipAddDel/ipAddDel
169
- @rm -f vendor/git.fd.io/govpp.git/cmd/binapi-generator/binapi-generator
155
+ @rm -f vendor/git.fd.io/govpp.git/cmd/binapi-generator/binapi-generator
170
156
@rm -f userspace/userspace
171
157
ifeq ($(VPPLCLINSTALLED ) ,1)
172
158
@echo VPP was installed by *make install*, so cleaning up files.
0 commit comments