From ec0504dbebc5e3f9e29606f1995a0ad0b603bdad Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Tue, 24 Jan 2017 21:47:23 +0100 Subject: fuel-plugin-ovs: Rebase patches and enable for N JIRA: ARMBAND-203 Change-Id: I8c1ca9a10b62751509a37b0079d4e7040e53a60d Signed-off-by: Alexandru Avadanii --- ...008-build-docker-Use-host-s-network-stack.patch | 30 ---------------------- 1 file changed, 30 deletions(-) delete mode 100644 patches/fuel-plugin-ovs/0008-build-docker-Use-host-s-network-stack.patch (limited to 'patches/fuel-plugin-ovs/0008-build-docker-Use-host-s-network-stack.patch') diff --git a/patches/fuel-plugin-ovs/0008-build-docker-Use-host-s-network-stack.patch b/patches/fuel-plugin-ovs/0008-build-docker-Use-host-s-network-stack.patch deleted file mode 100644 index e0606819..00000000 --- a/patches/fuel-plugin-ovs/0008-build-docker-Use-host-s-network-stack.patch +++ /dev/null @@ -1,30 +0,0 @@ -From: Alexandru Avadanii -Date: Thu, 15 Sep 2016 19:16:34 +0200 -Subject: [PATCH] build: docker: Use host's network stack - -Similar to Fuel@OPNFV build process, we want to mount /etc/hosts -in the builder container to be able to use local mirror caches. - -Signed-off-by: Alexandru Avadanii ---- - pre_build_hook | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/pre_build_hook b/pre_build_hook -index 3e46a37..4866219 100755 ---- a/pre_build_hook -+++ b/pre_build_hook -@@ -28,9 +28,11 @@ function build_pkg { - cd ${DIR}/ovs_build - if [ "${USE_DOCKER}" = true ]; then - sudo docker build -t ovs_build . -- sudo docker run -e "UBUNTU_ARCH=${UBUNTU_ARCH}" -v ${DEB_DIR}:/deb \ -+ sudo docker run -e "UBUNTU_ARCH=${UBUNTU_ARCH}" \ -+ -v ${DEB_DIR}:/deb -v /etc/hosts:/etc/hosts \ - -t ovs_build /ovs_build/build-ovs-dpdk.sh -- sudo docker run -e "UBUNTU_ARCH=${UBUNTU_ARCH}" -v ${DEB_DIR_NSH}:/deb \ -+ sudo docker run -e "UBUNTU_ARCH=${UBUNTU_ARCH}" \ -+ -v ${DEB_DIR_NSH}:/deb -v /etc/hosts:/etc/hosts \ - -t ovs_build /ovs_build/build-ovs-nsh-dpdk.sh - else - rm -rf /tmp/ovs-build-{,nsh-}dpdk; mkdir -p /tmp/ovs-build-{,nsh-}dpdk -- cgit 1.2.3-korg