From ec0504dbebc5e3f9e29606f1995a0ad0b603bdad Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
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 <Alexandru.Avadanii@enea.com>
---
 ...re_build_hook-Introduce-USE_DOCKER-option.patch | 77 ----------------------
 1 file changed, 77 deletions(-)
 delete mode 100644 patches/fuel-plugin-ovs/0004-pre_build_hook-Introduce-USE_DOCKER-option.patch

(limited to 'patches/fuel-plugin-ovs/0004-pre_build_hook-Introduce-USE_DOCKER-option.patch')

diff --git a/patches/fuel-plugin-ovs/0004-pre_build_hook-Introduce-USE_DOCKER-option.patch b/patches/fuel-plugin-ovs/0004-pre_build_hook-Introduce-USE_DOCKER-option.patch
deleted file mode 100644
index 7df0c5f6..00000000
--- a/patches/fuel-plugin-ovs/0004-pre_build_hook-Introduce-USE_DOCKER-option.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sun, 26 Jun 2016 20:00:22 +0200
-Subject: [PATCH] pre_build_hook: Introduce USE_DOCKER option
-
-The build system uses Ubuntu Trusty, which is not properly supported
-by Docker on AArch64 architecture.
-Introduce a new environment variable for enabling/disabling build
-containerization, and disable by default said variable for AArch64.
-
-This requires a slight rework of the pre_build_hook script.
-
-NOTE: Setting USE_DOCKER to false will build the packages on the host
-machine directly.
-
-AArch64 WARNING: This build will install packages automatically!
-
-Change-Id: Ib1294949ecc1767f12631a82e2c7099c45fcb615
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- pre_build_hook | 33 +++++++++++++++++++++++----------
- 1 file changed, 23 insertions(+), 10 deletions(-)
-
-diff --git a/pre_build_hook b/pre_build_hook
-index 63cf7b4..b9ae6bb 100755
---- a/pre_build_hook
-+++ b/pre_build_hook
-@@ -3,27 +3,40 @@
- set -eux
-
- BUILD_FOR=${BUILD_FOR:-ubuntu}
-+USE_DOCKER=${USE_DOCKER:-true}
- DIR="$(dirname `readlink -f $0`)"
-
-+if [ `uname -m` = 'aarch64' ]; then
-+  USE_DOCKER=false
-+fi
-+
- function build_pkg {
-   case $1 in
-     ubuntu)
--      rm -rf ${DIR}/repositories/ubuntu; mkdir -p ${DIR}/repositories/ubuntu
-+      DEB_DIR=${DIR}/deb-ovs-dpdk
-+      DEB_DIR_NSH=${DIR}/deb-ovs-nsh-dpdk
-+
-+      rm -rf ${DIR}/repositories/ubuntu ${DEB_DIR} ${DEB_DIR_NSH}
-+      mkdir -p ${DIR}/repositories/ubuntu ${DEB_DIR} ${DEB_DIR_NSH}
-+      sudo chmod -R 777 ${DEB_DIR} ${DEB_DIR_NSH}
-
-       cd ${DIR}/ovs_build
--      sudo docker build -t ovs_build .
-+      if [ "${USE_DOCKER}" = true ]; then
-+        sudo docker build -t ovs_build .
-+        sudo docker run -v ${DEB_DIR}:/deb -t ovs_build /ovs_build/build-ovs-dpdk.sh
-+        sudo docker run -v ${DEB_DIR_NSH}:/deb -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
-+        BUILD_HOME=/tmp/ovs-build-dpdk BUILD_DEB=${DEB_DIR} ./build-ovs-dpdk.sh
-+        BUILD_HOME=/tmp/ovs-build-nsh-dpdk BUILD_DEST=${DEB_DIR_NSH} ./build-ovs-nsh-dpdk.sh
-+        rm -rf /tmp/ovs-build-{,nsh-}dpdk
-+      fi
-
--      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
-       cd ${DEB_DIR}; tar czvf ../repositories/ubuntu/ovs-dpdk.tar.gz .;
-       cd ..; rm -rf ${DEB_DIR}
-
--      DEB_DIR=${DIR}/deb-ovs-nsh-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-nsh-dpdk.sh
--      cd ${DEB_DIR}; tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .;
--      cd ..; rm -rf ${DEB_DIR}
-+      cd ${DEB_DIR_NSH}; tar czvf ../repositories/ubuntu/ovs-nsh-dpdk.tar.gz .;
-+      cd ..; rm -rf ${DEB_DIR_NSH}
-
-       ;;
-     *) echo "Not supported system"; exit 1;;
-- 
cgit 1.2.3-korg