patches/fuel-plugin-ovs/0002-Cleanup-Drop-git-dependency.patch

   1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
   2 Date: Sat, 3 Sep 2016 20:42:06 +0200
   3 Subject: [PATCH] Cleanup: Drop git dependency
   4
   5 We only use git to fetch upstream contents, this can be achieved
   6 with a simple wget.
   7
   8 Change-Id: I07f681e44253cc1f390943eb121a694bf2c9d95f
   9 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 ---
  11  ovs_build/build-ovs-dpdk.sh     | 10 +++++-----
  12  ovs_build/build-ovs-nsh-dpdk.sh | 12 ++++++------
  13  2 files changed, 11 insertions(+), 11 deletions(-)
  14
  15 diff --git a/ovs_build/build-ovs-dpdk.sh b/ovs_build/build-ovs-dpdk.sh
  16 index aeb5eb7..01ba032 100755
  17 --- a/ovs_build/build-ovs-dpdk.sh
  18 +++ b/ovs_build/build-ovs-dpdk.sh
  19 @@ -3,14 +3,14 @@
  20  set -eux
  21
  22  OVS_COMMIT=9f4ecd654dbcb88b15a424445184591fc887537e
  23 -URL_OVS=https://github.com/openvswitch/ovs.git
  24 +URL_OVS_ARCHIVE=https://github.com/openvswitch/ovs/archive
  25  BUILD_DEB=${BUILD_DEB:-/deb}
  26  BUILD_SRC="$(dirname `readlink -f $0`)"
  27  BUILD_DEST=${BUILD_DEST:-/tmp/ovs-dpdk}
  28
  29  export DEB_BUILD_OPTIONS='parallel=8 nocheck'
  30
  31 -sudo apt-get -y install devscripts dpkg-dev git wget
  32 +sudo apt-get -y install devscripts dpkg-dev wget
  33
  34  rm -rf ${BUILD_DEST}; mkdir -p ${BUILD_DEST}
  35
  36 @@ -62,9 +62,9 @@ sudo apt-get install -y autoconf \
  37                 python-zopeinterface \
  38                 python-six
  39
  40 -git clone https://github.com/openvswitch/ovs.git
  41 -cd ovs; git checkout ${OVS_COMMIT}; rm -rf .git
  42 -cd ${BUILD_DEST}; cp -r ovs ovs-dpdk
  43 +wget -c ${URL_OVS_ARCHIVE}/${OVS_COMMIT}.tar.gz
  44 +tar xzf ${OVS_COMMIT}.tar.gz; mv ovs-${OVS_COMMIT} ovs
  45 +cp -r ovs ovs-dpdk
  46
  47  cd ovs-dpdk
  48  cp -r ${BUILD_SRC}/openvswitch-dpdk_2.5.90/debian .
  49 diff --git a/ovs_build/build-ovs-nsh-dpdk.sh b/ovs_build/build-ovs-nsh-dpdk.sh
  50 index 3d7edea..25e4b6c 100755
  51 --- a/ovs_build/build-ovs-nsh-dpdk.sh
  52 +++ b/ovs_build/build-ovs-nsh-dpdk.sh
  53 @@ -3,7 +3,7 @@
  54  set -eux
  55
  56  OVS_COMMIT=7d433ae57ebb90cd68e8fa948a096f619ac4e2d8
  57 -URL_OVS=https://github.com/openvswitch/ovs.git
  58 +URL_OVS_ARCHIVE=https://github.com/openvswitch/ovs/archive
  59  OVS_VER=${OVS_VER:-2.5.90}
  60  BUILD_HOME=$HOME/nsh
  61  BUILD_DEST=${BUILD_DEST:-/deb}
  62 @@ -12,7 +12,7 @@ DIR="$(dirname `readlink -f $0`)"
  63  export DEB_BUILD_OPTIONS='parallel=8 nocheck'
  64
  65  sudo apt-get build-dep openvswitch -y
  66 -sudo apt-get -y install devscripts dpkg-dev git wget
  67 +sudo apt-get -y install devscripts dpkg-dev wget
  68
  69  rm -rf ${BUILD_HOME}; mkdir -p ${BUILD_HOME}
  70
  71 @@ -35,7 +35,7 @@ sudo apt-get install -y debhelper \
  72                 texlive-fonts-recommended  \
  73                 texlive-latex-extra
  74
  75 -cd dpdk-2.2.0; rm -rf debian/patches/;
  76 +cd dpdk-2.2.0; rm -rf debian/patches/
  77  cat << EOF > debian/changelog
  78  dpdk (2.2.0-1) unstable; urgency=low
  79    * DPDK 2.2.0
  80 @@ -68,8 +68,8 @@ sudo apt-get install -y autoconf \
  81                 python-zopeinterface \
  82                 python-six
  83
  84 -git clone https://github.com/openvswitch/ovs.git
  85 -cd ovs; git checkout ${OVS_COMMIT}
  86 +wget -c ${URL_OVS_ARCHIVE}/${OVS_COMMIT}.tar.gz
  87 +tar xzf ${OVS_COMMIT}.tar.gz; mv ovs-${OVS_COMMIT} ovs
  88  PATCHES=$(cd ${DIR}/patches; echo *patch)
  89  for patch in ${PATCHES}
  90  do
  91 @@ -82,7 +82,7 @@ cd ../openvswitch-dpdk-${OVS_VER}
  92  sed -i "s/include\/rte_config.h/include\/dpdk\/rte_config.h/" acinclude.m4
  93  sed -i 's/DPDK_INCLUDE=.*/DPDK_INCLUDE=$RTE_SDK\/include\/dpdk/'  acinclude.m4
  94  autoreconf --install
  95 -rm -rf debian/patches/ .git;
  96 +rm -rf debian/patches/
  97  cat << EOF > debian/changelog
  98  openvswitch-dpdk (${OVS_VER}-1.nsh) unstable; urgency=low
  99    * Support NSH