Skip to content
This repository was archived by the owner on Apr 8, 2025. It is now read-only.

Commit be33aee

Browse files
committed
Remove ovs-config checks from Makefile
Signed-off-by: Kangas Toni Artturi <[email protected]>
1 parent eb88d91 commit be33aee

File tree

1 file changed

+2
-16
lines changed

1 file changed

+2
-16
lines changed

Diff for: Makefile

+2-16
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ endif
2424

2525
# Building the cnivpp subfolder requires VPP to be installed, or at least a
2626
# handful of files in the proper installed location. VPPINSTALLED indicates
27-
# if required VPP files are installed.
27+
# if required VPP files are installed.
2828
# For 'make clean', VPPLCLINSTALLED indicates if 'make install' installed
2929
# the minimum set of files or if VPP is actually installed.
3030
ifeq ($(shell test -e $(VPPLIBDIR)/libvppapiclient.so && echo -n yes),yes)
@@ -39,15 +39,6 @@ else
3939
VPPLCLINSTALLED=0
4040
endif
4141

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-
5142

5243
# Default to build
5344
default: build
@@ -147,11 +138,6 @@ endif
147138
@echo Installed /usr/share/vpp/api/*.json
148139
@rm -rf tmpvpp
149140
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
155141

156142

157143
extras:
@@ -166,7 +152,7 @@ clean:
166152
@rm -f cnivpp/test/memifAddDel/memifAddDel
167153
@rm -f cnivpp/test/vhostUserAddDel/vhostUserAddDel
168154
@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
170156
@rm -f userspace/userspace
171157
ifeq ($(VPPLCLINSTALLED),1)
172158
@echo VPP was installed by *make install*, so cleaning up files.

0 commit comments

Comments
 (0)