pkgdep/git: Remove vpp
VPP is going to be deprecated in 20.07, thus remove support for it from vm_setup.sh. Change-Id: Ic5891178bc439ff08475adbb2925b81c4a33525f Signed-off-by: Michal Berger <michalx.berger@intel.com> Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/3199 Community-CI: Mellanox Build Bot Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Tomasz Zawadzki <tomasz.zawadzki@intel.com>
This commit is contained in:
Michal Berger
Tomasz Zawadzki
parent
f4d0ab7111
commit
f0ba1e9e44
@ -1,20 +0,0 @@
|
|||||||
diff --git a/Makefile b/Makefile
|
|
||||||
index 8c7f3523f..b6a79529c 100644
|
|
||||||
--- a/Makefile
|
|
||||||
+++ b/Makefile
|
|
||||||
@@ -90,10 +90,12 @@ RPM_DEPENDS += libuuid-devel
|
|
||||||
RPM_DEPENDS += mbedtls-devel
|
|
||||||
|
|
||||||
ifeq ($(OS_ID),fedora)
|
|
||||||
- RPM_DEPENDS += dnf-utils
|
|
||||||
+ ifeq ("$(wildcard /usr/bin/package-cleanup)","")
|
|
||||||
+ RPM_DEPENDS += dnf-utils
|
|
||||||
+ endif
|
|
||||||
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'
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
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")
|
|
||||||
@ -1,46 +0,0 @@
|
|||||||
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")
|
|
||||||
@ -193,36 +193,6 @@ function install_qemu() {
|
|||||||
sudo make -C "$GIT_REPOS/qemu/$SPDK_QEMU_BRANCH" install
|
sudo make -C "$GIT_REPOS/qemu/$SPDK_QEMU_BRANCH" install
|
||||||
}
|
}
|
||||||
|
|
||||||
function install_vpp() {
|
|
||||||
if [[ -d /usr/local/src/vpp-19.04 ]]; then
|
|
||||||
echo "vpp already cloned."
|
|
||||||
if [[ ! -d /usr/local/src/vpp-19.04/build-root ]]; then
|
|
||||||
echo "build-root has not been done"
|
|
||||||
echo "remove the $(pwd) and start again"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
git clone "${GIT_REPO_VPP}" "$GIT_REPOS/vpp"
|
|
||||||
git -C "$GIT_REPOS/vpp" checkout v19.04.2
|
|
||||||
|
|
||||||
if [ "${OSID}" == 'fedora' ]; then
|
|
||||||
if [ ${OSVERSION} -eq 29 ]; then
|
|
||||||
git -C "$GIT_REPOS/vpp" apply ${VM_SETUP_PATH}/patch/vpp/fedora29-fix.patch
|
|
||||||
fi
|
|
||||||
if [ ${OSVERSION} -eq 30 ]; then
|
|
||||||
git -C "$GIT_REPOS/vpp" apply ${VM_SETUP_PATH}/patch/vpp/fedora30-fix.patch
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Installing required dependencies for building VPP
|
|
||||||
yes | make -C "$GIT_REPOS/vpp" install-dep
|
|
||||||
|
|
||||||
make -C "$GIT_REPOS/vpp" build -j${jobs}
|
|
||||||
|
|
||||||
sudo mv "$GIT_REPOS/vpp" /usr/local/src/vpp-19.04
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
function install_nvmecli() {
|
function install_nvmecli() {
|
||||||
SPDK_NVME_CLI_BRANCH=spdk-1.6
|
SPDK_NVME_CLI_BRANCH=spdk-1.6
|
||||||
if [[ ! -d $GIT_REPOS/nvme-cli ]]; then
|
if [[ ! -d $GIT_REPOS/nvme-cli ]]; then
|
||||||
@ -292,8 +262,6 @@ export GIT_REPO_FIO
|
|||||||
export GIT_REPO_FLAMEGRAPH
|
export GIT_REPO_FLAMEGRAPH
|
||||||
: ${GIT_REPO_QEMU=https://github.com/spdk/qemu}
|
: ${GIT_REPO_QEMU=https://github.com/spdk/qemu}
|
||||||
export GIT_REPO_QEMU
|
export GIT_REPO_QEMU
|
||||||
: ${GIT_REPO_VPP=https://gerrit.fd.io/r/vpp}
|
|
||||||
export GIT_REPO_VPP
|
|
||||||
: ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi}
|
: ${GIT_REPO_LIBISCSI=https://github.com/sahlberg/libiscsi}
|
||||||
export GIT_REPO_LIBISCSI
|
export GIT_REPO_LIBISCSI
|
||||||
: ${GIT_REPO_SPDK_NVME_CLI=https://github.com/spdk/nvme-cli}
|
: ${GIT_REPO_SPDK_NVME_CLI=https://github.com/spdk/nvme-cli}
|
||||||
@ -324,7 +292,6 @@ else
|
|||||||
jobs=$(($(nproc) * 2))
|
jobs=$(($(nproc) * 2))
|
||||||
sources+=(
|
sources+=(
|
||||||
install_libiscsi
|
install_libiscsi
|
||||||
install_vpp
|
|
||||||
install_nvmecli
|
install_nvmecli
|
||||||
install_qat
|
install_qat
|
||||||
install_rocksdb
|
install_rocksdb
|
||||||
|
|||||||
@ -28,7 +28,7 @@ VM_SETUP_PATH=$(readlink -f ${BASH_SOURCE%/*})
|
|||||||
|
|
||||||
UPGRADE=false
|
UPGRADE=false
|
||||||
INSTALL=false
|
INSTALL=false
|
||||||
CONF="rocksdb,fio,flamegraph,tsocks,qemu,vpp,libiscsi,nvmecli,qat,spdk,refspdk"
|
CONF="rocksdb,fio,flamegraph,tsocks,qemu,libiscsi,nvmecli,qat,spdk,refspdk"
|
||||||
|
|
||||||
if [[ -e /etc/os-release ]]; then
|
if [[ -e /etc/os-release ]]; then
|
||||||
source /etc/os-release
|
source /etc/os-release
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user