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>
---
 .../fuel-plugin-ovs/0003-build-apt-force-yes.patch | 87 ----------------------
 1 file changed, 87 deletions(-)
 delete mode 100644 patches/fuel-plugin-ovs/0003-build-apt-force-yes.patch

(limited to 'patches/fuel-plugin-ovs/0003-build-apt-force-yes.patch')

diff --git a/patches/fuel-plugin-ovs/0003-build-apt-force-yes.patch b/patches/fuel-plugin-ovs/0003-build-apt-force-yes.patch
deleted file mode 100644
index 9ec04cd2..00000000
--- a/patches/fuel-plugin-ovs/0003-build-apt-force-yes.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
-Date: Sat, 3 Sep 2016 20:52:05 +0200
-Subject: [PATCH] build: apt: --force-yes.
-
-For arm64 builds, some packages are fetched from linux.enea.com,
-leading to package version being reported as "older", although in
-fact it is newer (dpkg version comparison is not that great with
-suffixes). Also, since we don't explicitly add the GPG key of
-the linux.enea.com repo yet, apt is complaining about unverified
-package sources.
-
-Bypass the above by using "--force-yes", next to "-y".
-
-Change-Id: I4899fe62aaad9a13f8b2f9ffbdf2f3631ecba164
-Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
----
- ovs_build/build-ovs-dpdk.sh     | 8 ++++----
- ovs_build/build-ovs-nsh-dpdk.sh | 8 ++++----
- 2 files changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
-index 01ba032..dd9c6ff 100755
---- a/ovs_build/build-ovs-dpdk.sh
-+++ b/ovs_build/build-ovs-dpdk.sh
-@@ -10,7 +10,7 @@ BUILD_DEST=${BUILD_DEST:-/tmp/ovs-dpdk}
-
- export DEB_BUILD_OPTIONS='parallel=8 nocheck'
-
--sudo apt-get -y install devscripts dpkg-dev wget
-+sudo apt-get -y --force-yes install devscripts dpkg-dev wget
-
- rm -rf ${BUILD_DEST}; mkdir -p ${BUILD_DEST}
-
-@@ -21,7 +21,7 @@ cd dpdk-16.07
- cp -r ${BUILD_SRC}/dpdk_16.07/debian .
-
- # copy from debian/control
--sudo apt-get install -y debhelper \
-+sudo apt-get install -y --force-yes debhelper \
-                dh-python \
-                dh-systemd \
-                doxygen  \
-@@ -41,9 +41,9 @@ cd ${BUILD_DEST}
- sudo dpkg -i *.deb
- apt-get download libxenstore3.0
-
--sudo apt-get build-dep openvswitch -y
-+sudo apt-get build-dep openvswitch -y --force-yes
- # copy from debian/control
--sudo apt-get install -y autoconf \
-+sudo apt-get install -y --force-yes autoconf \
-                automake \
-                bzip2 \
-                debhelper \
-diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
-index 25e4b6c..3751c02 100755
---- a/ovs_build/build-ovs-nsh-dpdk.sh
-+++ b/ovs_build/build-ovs-nsh-dpdk.sh
-@@ -11,8 +11,8 @@ DIR="$(dirname `readlink -f $0`)"
-
- export DEB_BUILD_OPTIONS='parallel=8 nocheck'
-
--sudo apt-get build-dep openvswitch -y
--sudo apt-get -y install devscripts dpkg-dev wget
-+sudo apt-get build-dep openvswitch -y --force-yes
-+sudo apt-get -y --force-yes install devscripts dpkg-dev wget
-
- rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}
-
-@@ -20,7 +20,7 @@ cd ${BUILD_HOME}
- dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/dpdk_2.2.0-0ubuntu8.dsc
-
- # copy from debian/control
--sudo apt-get install -y debhelper \
-+sudo apt-get install -y --force-yes debhelper \
-                dh-python \
-                dh-systemd \
-                doxygen  \
-@@ -49,7 +49,7 @@ cd ${BUILD_HOME}
- dget -x -u https://launchpad.net/ubuntu/+archive/primary/+files/openvswitch-dpdk_2.4.0-0ubuntu1.dsc
-
- # copy from debian/control
--sudo apt-get install -y autoconf \
-+sudo apt-get install -y --force-yes autoconf \
-                automake \
-                bzip2 \
-                debhelper \
-- 
cgit 1.2.3-korg