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>

3 files changed, 27 insertions, 77 deletions

diff --git a/patches/fuel-plugin-ovs/0001-AArch64-Add-support-for-downloading-prebuilt-DEBs.patch b/patches/fuel-plugin-ovs/0001-AArch64-Add-support-for-downloading-prebuilt-DEBs.patch
index 3b334992..4889ca95 100644
--- a/patches/fuel-plugin-ovs/0001-AArch64-Add-support-for-downloading-prebuilt-DEBs.patch
+++ b/patches/fuel-plugin-ovs/0001-AArch64-Add-support-for-downloading-prebuilt-DEBs.patch
@@ -6,17 +6,17 @@ Change-Id: I6042f9f7bdde5a15e3cb5a94ab67a990faae0418
 Signed-off-by: Anders Roxell <anders.roxell@enea.com>
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- ovs_build/prebuilt-ovs-fetch.sh | 86 +++++++++++++++++++++++++++++++++++++++++
- pre_build_hook                  | 10 +++++
- 2 files changed, 96 insertions(+)
+ ovs_build/prebuilt-ovs-fetch.sh | 70 +++++++++++++++++++++++++++++++++++++++++
+ pre_build_hook                  | 10 ++++++
+ 2 files changed, 80 insertions(+)
  create mode 100755 ovs_build/prebuilt-ovs-fetch.sh
 
 diff --git a/ovs_build/prebuilt-ovs-fetch.sh b/ovs_build/prebuilt-ovs-fetch.sh
 new file mode 100755
-index 0000000..f8b88a3
+index 0000000..b4f30c5
 --- /dev/null
 +++ b/ovs_build/prebuilt-ovs-fetch.sh
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,70 @@
 +#!/bin/bash
 +
 +set -eux
@@ -81,30 +81,14 @@ index 0000000..f8b88a3
 +  ARMBAND_SRCS="dists/mos10.0-fuel-plugin-ovs/main/source/Sources"
 +  ARMBAND_BINS="dists/mos10.0-fuel-plugin-ovs/main/binary-${arch}/Packages"
 +
-+  # DPDK (common)
-+  armband_fetch 'dpdk' '.*' \
-+    "${ARMBAND_BASE}" "${ARMBAND_SRCS}" "${ARMBAND_BINS}"
-+  mv *.deb ${BUILD_DEST}; rm -rf *
-+
-+  # OVS, OVS-DPDK (without NSH)
-+  armband_fetch 'openvswitch' '(?:(?!nsh).)*' \
-+    "${ARMBAND_BASE}" "${ARMBAND_SRCS}" "${ARMBAND_BINS}"
-+  armband_fetch 'openvswitch-dpdk' '(?:(?!nsh).)*' \
-+    "${ARMBAND_BASE}" "${ARMBAND_SRCS}" "${ARMBAND_BINS}"
-+  mkdir -p ${BUILD_HOME}/deb; mv *.deb ${BUILD_HOME}/deb; cd ${BUILD_HOME}/deb
-+  tar czvf ${BUILD_DEST}/ovs-dpdk_${arch}.tar.gz .;
-+  cd ${BUILD_HOME}; rm -rf *
-+
-+  # OVS, OVS-DPDK (with NSH)
++  # OVS with NSH
 +  armband_fetch 'openvswitch' '.*nsh' \
 +    "${ARMBAND_BASE}" "${ARMBAND_SRCS}" "${ARMBAND_BINS}"
-+  armband_fetch 'openvswitch-dpdk' '.*nsh' \
-+    "${ARMBAND_BASE}" "${ARMBAND_SRCS}" "${ARMBAND_BINS}"
 +  mkdir -p ${BUILD_HOME}/deb; mv *.deb ${BUILD_HOME}/deb; cd ${BUILD_HOME}/deb
-+  tar czvf ${BUILD_DEST}/ovs-nsh-dpdk_${arch}.tar.gz .;
++  tar czvf ${BUILD_DEST}/ovs-nsh_${arch}.tar.gz .;
 +done
 diff --git a/pre_build_hook b/pre_build_hook
-index 194a7b9..0c27358 100755
+index a955678..f9a6010 100755
 --- a/pre_build_hook
 +++ b/pre_build_hook
 @@ -6,6 +6,11 @@ BUILD_FOR=${BUILD_FOR:-ubuntu}
@@ -119,9 +103,9 @@ index 194a7b9..0c27358 100755
  function build_pkg {
    case ${BUILD_ARCH} in
      arm64)
-@@ -27,6 +32,11 @@ function build_pkg {
+@@ -24,6 +29,11 @@ function build_pkg {
        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
        cp -r ${DEB_DIR}/*  ${DIR}/repositories/ubuntu/
 +
 +      rm -rf ${DEB_DIR};  mkdir -p ${DEB_DIR}; chmod 777 ${DEB_DIR};
diff --git a/patches/fuel-plugin-ovs/0002-deb-src-Enable-building-Debian-source-pkgs.patch b/patches/fuel-plugin-ovs/0002-deb-src-Enable-building-Debian-source-pkgs.patch
index c7b90a0d..2fe1ee2a 100644
--- a/patches/fuel-plugin-ovs/0002-deb-src-Enable-building-Debian-source-pkgs.patch
+++ b/patches/fuel-plugin-ovs/0002-deb-src-Enable-building-Debian-source-pkgs.patch
@@ -13,10 +13,10 @@ passing an useless env var to each docker run).
 Change-Id: I4e308d84c2eb01af043ed73440c46fc692c30d12
 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 ---
- ovs_build/build-ovs-dpdk.sh                        | 28 ++++++++++++++----
- ovs_build/build-ovs-nsh-dpdk.sh                    | 34 +++++++++++++++++-----
+ ovs_build/build-ovs-dpdk.sh                        | 28 +++++++++++++++++-----
+ ovs_build/build-ovs-nsh.sh                         | 26 +++++++++++++++++---
  .../debian/patches/series                          |  1 -
- 3 files changed, 49 insertions(+), 14 deletions(-)
+ 3 files changed, 45 insertions(+), 10 deletions(-)
  delete mode 100644 ovs_build/openvswitch_2.6-dpdk_16.07/debian/patches/series
 
 diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
@@ -87,11 +87,11 @@ index 7ce2a62..8dd7430 100755
 
  cp -r ${BUILD_HOME}/*.deb ${BUILD_HOME}/deb
  cd ${BUILD_HOME}/deb
-diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
-index e6f8faf..03b494c 100755
---- a/ovs_build/build-ovs-nsh-dpdk.sh
-+++ b/ovs_build/build-ovs-nsh-dpdk.sh
-@@ -11,14 +11,30 @@ DEB_ARCH="$(dpkg --print-architecture)"
+diff --git a/ovs_build/build-ovs-nsh.sh b/ovs_build/build-ovs-nsh.sh
+index dbebdb2..efbabab 100755
+--- a/ovs_build/build-ovs-nsh.sh
++++ b/ovs_build/build-ovs-nsh.sh
+@@ -11,6 +11,22 @@ DEB_ARCH="$(dpkg --print-architecture)"
 
  export DEB_BUILD_OPTIONS='parallel=8 nocheck'
 
@@ -114,26 +114,7 @@ index e6f8faf..03b494c 100755
  sudo apt-get update
  sudo apt-get -y --force-yes install devscripts dpkg-dev git wget dkms
 
- rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}/deb
-
- cd ${BUILD_HOME}
--wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz
--xz -d dpdk-16.07.tar.xz; tar xvf dpdk-16.07.tar
-+wget -c http://fast.dpdk.org/rel/dpdk-16.07.tar.xz -O dpdk_16.07.orig.tar.xz
-+tar xJvf dpdk_16.07.orig.tar.xz
- cd dpdk-16.07
- cp -r ${BUILD_SRC}/dpdk_16.07.fuel/debian .
- cat << EOF > debian/changelog
-@@ -45,7 +61,7 @@ sudo apt-get install -y --force-yes debhelper \
-                python-sphinx  \
-                texlive-fonts-recommended  \
-                texlive-latex-extra
--debian/rules build; fakeroot debian/rules binary
-+debian_build
-
- cd ${BUILD_HOME}
- sudo apt-get install -y --force-yes hwdata
-@@ -73,12 +89,16 @@ sudo apt-get install -y --force-yes autoconf \
+@@ -39,12 +55,16 @@ sudo apt-get install -y --force-yes autoconf \
                 python-six
 
  git clone https://github.com/openvswitch/ovs.git
@@ -149,19 +130,10 @@ index e6f8faf..03b494c 100755
 +    patch -p1 < debian/patches/${patch}
  done
 +cp debian/patches/series .pc/applied-patches
- cd ${BUILD_HOME}; cp -r ovs ovs-dpdk
-
- cd ovs-dpdk
-@@ -91,7 +111,7 @@ openvswitch-dpdk (${OVS_VER}-1.nsh) unstable; urgency=low
-  -- Open vSwitch team <dev@openvswitch.org>  $(date --rfc-2822)
- EOF
 
--debian/rules build; fakeroot debian/rules binary
-+debian_build
-
- cd ${BUILD_HOME}/ovs
  cat << EOF > debian/changelog
-@@ -101,7 +121,7 @@ openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low
+ openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low
+@@ -53,7 +73,7 @@ openvswitch (${OVS_VER}-1.nsh) unstable; urgency=low
 
   -- Open vSwitch team <dev@openvswitch.org>  $(date --rfc-2822)
  EOF
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};