Code Review
/
fuel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fixed deployment timeout and OVSNFV plugin build
[fuel.git]
/
build
/
f_isoroot
/
f_ovs-nsh-dpdk-pluginbuild
/
Makefile
diff --git
a/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
b/build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
index
f89f8d9
..
5e38b4c
100644
(file)
--- a/
build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
+++ b/
build/f_isoroot/f_ovs-nsh-dpdk-pluginbuild/Makefile
@@
-22,16
+22,15
@@
all: .ovsbuild
.PHONY: clean
clean:
.PHONY: clean
clean:
- @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs
*.rpm fuel-plugin-ovs
*.rpm
+ @rm -f .ovsbuild ../release/opnfv/fuel-plugin-ovs
-*.rpm fuel-plugin-ovs-
*.rpm
@rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt
.PHONY: release
release:.ovsbuild
@rm -f $(BUILD_BASE)/gitinfo_ovs-nsh-dpdk-plugin.txt gitinfo_ovs-nsh-dpdk-plugin.txt
.PHONY: release
release:.ovsbuild
- @rm -f ../release/opnfv/fuel-plugin-ovs*.rpm
+ @rm -f ../release/opnfv/fuel-plugin-ovs
-
*.rpm
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovs*.rpm ../release/opnfv/
cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
@mkdir -p ../release/opnfv
@cp fuel-plugin-ovs*.rpm ../release/opnfv/
cp gitinfo_ovs-nsh-dpdk-plugin.txt $(BUILD_BASE)
- cd $(BUILD_BASE) && mkdir -p ../deploy/templates/plugins && cp -rf $(TOP)/config/* ../deploy/templates/plugins
.ovsbuild:
@rm -rf fuel-plugin-ovs
.ovsbuild:
@rm -rf fuel-plugin-ovs