diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-15 19:01:09 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-15 21:00:38 +0200 |
commit | 6be5639d8ce2f6e282db6f3d19699a341b9b491c (patch) | |
tree | a76a81d02956d8935ae814f07397c25a803d1b6d /patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch | |
parent | 68aedf6ba0de99d61771dcee635af908ead6ac0b (diff) |
fuel-plugin-ovs: Simplify debian version strings
Remove all suffixes from OVS debian packages, and simplify the
plugin code handling the fetching of said packages.
While at it, enable:
- local mirror caches, by mounting /etc/hosts in the docker
builder
- HACK: mismatch between debian source versions and debian binaries
Related-bug: ARMBAND-89
Change-Id: Ifbf0e11c90cf7b2f76ce72af8ca3469a33bee071
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch')
-rw-r--r-- | patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch b/patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch new file mode 100644 index 00000000..e0606819 --- /dev/null +++ b/patches/fuel-plugin-ovs/0009-build-docker-Use-host-s-network-stack.patch @@ -0,0 +1,30 @@ +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com> +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 <Alexandru.Avadanii@enea.com> +--- + 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 |