ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vpp: Apply Fedora 30 patch on Fedora 31

Browse Source 
Fixes introduced by 9307ff5a are applicable to Fedora 31 too, thus
use the very same copy of the patch while compiling vpp on that
version of the system.

Signed-off-by: Michal Berger <michalx.berger@intel.com>
Change-Id: I4445497f928a1a509c5adbccfe244ff9eef7275b
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2676
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
Reviewed-by: Jim Harris <james.r.harris@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
This commit is contained in:
Michal Berger 2020-05-28 17:35:58 +02:00 committed by Tomasz Zawadzki
parent 9d4264dad2
commit c9d3d5a159
2 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
test/common/config/patch/vpp/fedora31-fix.patch Normal file
View File

@ -0,0 +1,46 @@
diff --git a/Makefile b/Makefile
index 8c7f3523f..20814ee8d 100644
--- a/Makefile
+++ b/Makefile
@@ -92,8 +92,8 @@ RPM_DEPENDS += mbedtls-devel
ifeq ($(OS_ID),fedora)
RPM_DEPENDS += dnf-utils
RPM_DEPENDS += subunit subunit-devel
- RPM_DEPENDS += compat-openssl10-devel
- RPM_DEPENDS += python2-devel python34-ply
+ RPM_DEPENDS += openssl-devel
+ RPM_DEPENDS += python2-devel
RPM_DEPENDS += python2-virtualenv
RPM_DEPENDS += cmake
RPM_DEPENDS_GROUPS = 'C Development Tools and Libraries'
diff --git a/build/external/packages/dpdk.mk b/build/external/packages/dpdk.mk
index a551151bb..b0258017a 100644
--- a/build/external/packages/dpdk.mk
+++ b/build/external/packages/dpdk.mk
@@ -147,7 +147,7 @@ endif
endif
endif
-DPDK_EXTRA_CFLAGS += -L$(I)/lib -I$(I)/include
+DPDK_EXTRA_CFLAGS += -L$(I)/lib -I$(I)/include -Wno-address-of-packed-member
# assemble DPDK make arguments
DPDK_MAKE_ARGS := -C $(DPDK_SOURCE) -j $(JOBS) \
diff --git a/src/plugins/crypto_ia32/CMakeLists.txt b/src/plugins/crypto_ia32/CMakeLists.txt
index a100cdbb6..92e408098 100644
--- a/src/plugins/crypto_ia32/CMakeLists.txt
+++ b/src/plugins/crypto_ia32/CMakeLists.txt
@@ -22,3 +22,4 @@ add_vpp_plugin(crypto_ia32
)
target_compile_options(crypto_ia32_plugin PRIVATE "-march=silvermont")
+target_compile_options(crypto_ia32_plugin PRIVATE "-maes")
diff --git a/src/plugins/crypto_ipsecmb/CMakeLists.txt b/src/plugins/crypto_ipsecmb/CMakeLists.txt
index 0d08032c0..6a7eb148f 100644
--- a/src/plugins/crypto_ipsecmb/CMakeLists.txt
+++ b/src/plugins/crypto_ipsecmb/CMakeLists.txt
@@ -39,3 +39,4 @@ else()
endif()
target_compile_options(crypto_ipsecmb_plugin PRIVATE "-march=silvermont")
+target_compile_options(crypto_ipsecmb_plugin PRIVATE "-maes")

3
test/common/config/vm_setup.sh
View File

@ -276,6 +276,9 @@ function install_vpp() {
if [ ${OSVERSION} -eq 30 ]; then
git -C ./vpp apply ${VM_SETUP_PATH}/patch/vpp/fedora30-fix.patch
fi
if ((OVERSION == 31)); then
git -C ./vpp apply "$VM_SETUP_PATH/patch/vpp/fedora31-fix.patch"
fi
fi
# vpp depends on python-ply, however some packages on different Fedoras don't