diff options
author | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-20 19:28:17 +0200 |
---|---|---|
committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-09-14 21:12:19 +0000 |
commit | c760fb90b107305ecf23fbe5a704c5660c971ca6 (patch) | |
tree | f02462bb5de9d404f1501d1a4e7a37da22ca297b /patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch | |
parent | 9ab1dc365a10f5bb0da9369b6fb96039291dd1f0 (diff) |
AArch64: fuel-plugin-ovs enable
OVS-DPDK-NSH is not supported on arm64 for now, see [1]
Closes: ARMBAND-46
[1] https://jira.opnfv.org/browse/ARMBAND-86
Change-Id: I79b33bab7348e297c06ff4bb2bf7cc23f21eb7e3
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 5b49b2f7ea1485b56ebc7815b5a3803363ec29af)
Diffstat (limited to 'patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch')
-rw-r--r-- | patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch b/patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch new file mode 100644 index 00000000..5b5712d0 --- /dev/null +++ b/patches/fuel-plugin-ovs/0004-build-apt-force-yes.patch @@ -0,0 +1,87 @@ +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 9e92014..75904f2 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 ec5eef4..3b84f4c 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 \ |