diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-15 17:16:45 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-02-15 17:32:58 +0100 |
| commit | 4d36c77996e54ddda8c7c5e0677bb198e45c0f09 (patch) | |
| tree | 5923c884573421c68e146bf0e92dd8e6687bc69b /patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch | |
| parent | 13e1af834430e1679f4ffe307e2acf7d02bf1441 (diff) | |
fuel-plugin-ovs: Rebase after ovs-dpdk removal
Upstream dropped ovs, ovs-dpdk, as well as ovs-nsh-dpdk from
this plugin, so our patches need a refresh.
Change-Id: Ic79c7d8a026f01bc720d9021c716b318ef4b1128
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch')
| -rw-r--r-- | patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch b/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch index ea81a7b0..c4933934 100644 --- a/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch +++ b/patches/fuel-plugin-ovs/0003-build-docker-Use-host-s-network-stack.patch @@ -7,26 +7,20 @@ in the builder container to be able to use local mirror caches. Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> --- - pre_build_hook | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) + pre_build_hook | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pre_build_hook b/pre_build_hook -index 0c27358..30ca109 100755 +index f9a6010..76da923 100755 --- a/pre_build_hook +++ b/pre_build_hook -@@ -26,16 +26,19 @@ function build_pkg { - +@@ -27,12 +27,14 @@ function build_pkg { DEB_DIR=${DIR}/deb-ovs-dpdk - rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; -- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh -+ sudo docker run -v ${DEB_DIR}:/deb -v /etc/hosts:/etc/hosts \ -+ -t ovs_build /ovs_build/build-ovs-dpdk.sh - cp -r ${DEB_DIR}/* ${DIR}/repositories/ubuntu/ rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; -- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh +- sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-nsh.sh + sudo docker run -v ${DEB_DIR}:/deb -v /etc/hosts:/etc/hosts \ -+ -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh ++ -t ovs_build /ovs_build/build-ovs-nsh.sh cp -r ${DEB_DIR}/* ${DIR}/repositories/ubuntu/ rm -rf ${DEB_DIR}; mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR}; |