summaryrefslogtreecommitdiffstats
path: root/extras
diff options
context:
space:
mode:
authorSergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>2017-10-27 08:58:38 +0100
committerDamjan Marion <dmarion.lists@gmail.com>2017-11-05 11:35:12 +0000
commit6184db357d6af92173e78333e83b0ac4c8e5b51f (patch)
treecf44bdc6820c113c02044a32e9b12c1d149ed4b2 /extras
parent37d39672de5d3e0d0f928d61eec8f66cd73c7fe8 (diff)
dpdk: build nasm from source
As not all distros have the minimum required nasm version (2.12.01) available, build nasm from sources when building Intel IPsec MB library. Change-Id: Iaa9da87f612c0f84da5704162c3bf430b3351076 Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Diffstat (limited to 'extras')
-rw-r--r--extras/rpm/vpp.spec3
-rwxr-xr-xextras/vagrant/update.sh4
2 files changed, 0 insertions, 7 deletions
diff --git a/extras/rpm/vpp.spec b/extras/rpm/vpp.spec
index 7490a165b37..6dc04b82f7d 100644
--- a/extras/rpm/vpp.spec
+++ b/extras/rpm/vpp.spec
@@ -50,9 +50,6 @@ BuildRequires: python-devel, python-virtualenv
BuildRequires: libffi-devel
BuildRequires: glibc-static, java-1.8.0-openjdk, java-1.8.0-openjdk-devel yum-utils, redhat-lsb
BuildRequires: apr-devel
-%if %{with aesni}
-BuildRequires: nasm
-%endif
BuildRequires: numactl-devel
BuildRequires: autoconf automake libtool byacc bison flex
diff --git a/extras/vagrant/update.sh b/extras/vagrant/update.sh
index 18bc25736a1..3fb456b26eb 100755
--- a/extras/vagrant/update.sh
+++ b/extras/vagrant/update.sh
@@ -44,8 +44,4 @@ elif [ "$OS_ID" == "centos" ]; then
# Standard update + upgrade dance
yum check-update
yum update -y
-elif [ "$OS_ID" == "opensuse" ]; then
- zypper update -y
- # NASM >= 2.12 is not available in previous openSUSE release; need to install it from TW
- zypper install -y https://download.opensuse.org/tumbleweed/repo/oss/suse/x86_64/nasm-2.13.01-2.1.x86_64.rpm
fi