Merge "Change the method of building dpdk by using rpm for centos"

2 files changed, 97 insertions, 24 deletions

diff --git a/scripts/build.sh b/scripts/build.sh
index a35dcde..9da32dd 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -33,10 +33,10 @@ echo OS_ID: $OS_ID
 echo OS_VERSION_ID: $OS_ID
 
 #DPDK download path
-DPDK_DOWNLOAD_PATH=/root/dpdk
+DPDK_DOWNLOAD_PATH=/tmp/dpdk
 
 #dpdk installation path
-DPDK_INSTALL_PATH=/root/dpdk_install/tmp
+DPDK_INSTALL_PATH=/usr
 
 #set and check the environment for Linux
 #set env
@@ -101,46 +101,46 @@ if [ $pdpe1gbFlag -eq 0 ]; then
 fi
 
 mkdir /mnt/nstackhuge -p
-mount -t hugetlbfs -o pagesize=1G none /mnt/nstackhuge/
+sudo mount -t hugetlbfs -o pagesize=1G none /mnt/nstackhuge/
 
-mkdir -p /var/run/ip_module/
+sudo mkdir -p /var/run/ip_module/
 
 #===========build DPDK================
-if [ -d $DPDK_INSTALL_PATH ]; then
-  rm -rf $DPDK_INSTALL_PATH
-fi
 
-mkdir -p $DPDK_DOWNLOAD_PATH
+if [ "$OS_ID" == "centos" ]; then
+    ./build_dpdk.sh
+else
+    mkdir -p $DPDK_DOWNLOAD_PATH
 
-cd $DPDK_DOWNLOAD_PATH
-rm -rf dpdk-16.04/
-wget https://fast.dpdk.org/rel/dpdk-16.04.tar.xz
-tar xvf dpdk-16.04.tar.xz
-cd dpdk-16.04/
+    cd $DPDK_DOWNLOAD_PATH
+    rm -rf dpdk-16.04/
+    wget https://fast.dpdk.org/rel/dpdk-16.04.tar.xz
+    tar xvf dpdk-16.04.tar.xz
+    cd dpdk-16.04/
 
-sed -i 's!CONFIG_RTE_EXEC_ENV=.*!CONFIG_RTE_EXEC_ENV=y!1' config/common_base
-sed -i 's!CONFIG_RTE_BUILD_SHARED_LIB=.*!CONFIG_RTE_BUILD_SHARED_LIB=y!1' config/common_base
-sed -i 's!CONFIG_RTE_LIBRTE_EAL=.*!CONFIG_RTE_LIBRTE_EAL=y!1' config/common_base
+    sed -i 's!CONFIG_RTE_EXEC_ENV=.*!CONFIG_RTE_EXEC_ENV=y!1' config/common_base
+    sed -i 's!CONFIG_RTE_BUILD_SHARED_LIB=.*!CONFIG_RTE_BUILD_SHARED_LIB=y!1' config/common_base
+    sed -i 's!CONFIG_RTE_LIBRTE_EAL=.*!CONFIG_RTE_LIBRTE_EAL=y!1' config/common_base
 
-make install  T=x86_64-native-linuxapp-gcc DESTDIR=${DPDK_INSTALL_PATH}
-cd x86_64-native-linuxapp-gcc
-make
+    make install  T=x86_64-native-linuxapp-gcc DESTDIR=${DPDK_INSTALL_PATH}
+    cd x86_64-native-linuxapp-gcc
+    make
+fi
 
 export LD_LIBRARY_PATH=$LIB_PATH
 export NSTACK_LOG_ON=DBG
-
 #===========build DMM=================
 echo "DMM build started....."
 
 cd $LIB_PATH
-rm -rf *
+sudo rm -rf *
 
 cd ../../thirdparty/glog/glog-0.3.4/
 sudo autoreconf -ivf
 
 cd $BUILD_DIR
-rm -rf *
-cmake -D DMM_DPDK_INSTALL_DIR=$DPDK_INSTALL_PATH ..
-make -j 8
+sudo rm -rf *
+sudo cmake ..
+sudo make -j 8
 
 echo "DMM build finished....."
diff --git a/scripts/build_dpdk.sh b/scripts/build_dpdk.sh
new file mode 100644
index 0000000..be5fc2c
--- /dev/null
+++ b/scripts/build_dpdk.sh
@@ -0,0 +1,73 @@
+#########################################################################
+#
+# Copyright (c) 2018 Huawei Technologies Co.,Ltd.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#########################################################################
+#!/bin/sh
+
+echo "check whether dpdk installed"
+cur_directory=${PWD}
+check_dpdk=$(rpm -qa | grep dpdk)
+if [ -z "$check_dpdk"  ]; then
+    echo "system will install the dpdk"
+else
+    echo "system has installed the dpdk"
+    echo "$check_dpdk"
+    exit 0
+fi
+
+cd ~
+mkdir -p rpmbuild/SOURCES
+
+cd ~/rpmbuild/SOURCES
+wget http://dpdk.org/browse/dpdk/snapshot/dpdk-16.04.tar.gz
+
+tar xzvf dpdk-16.04.tar.gz
+cp dpdk-16.04/pkg/dpdk.spec ~/rpmbuild/SOURCES/
+
+echo "modify the spec"
+
+#get rid of the dependence of xen-devel
+sed -i '48d' dpdk.spec
+sed -i '47a BuildRequires: kernel-devel, kernel-headers, libpcap-devel' dpdk.spec
+
+#get rid of the dependence of texlive-collection
+sed -i '/BuildRequires: texlive-collection/s/^/#&/' dpdk.spec
+
+#delete something about xen
+sed -i '/LIBRTE_PMD_XENVIRT/s/^/#&/' dpdk.spec
+sed -i '/LIBRTE_XEN_DOM0/s/^/#&/' dpdk.spec
+
+#delete something of generating doc
+sed -i '/%{target} doc/s/^/#&/' dpdk.spec
+sed -i '94d' dpdk.spec
+sed -i '93a      datadir=%{_datadir}/dpdk' dpdk.spec
+sed -i '94a #      datadir=%{_datadir}/dpdk docdir=%{_docdir}/dpdk' dpdk.spec
+sed -i '/%files doc/s/^/#&/' dpdk.spec
+sed -i '/%doc %{_docdir}/s/^/#&/' dpdk.spec
+
+sed -i '76a sed -i 's!CONFIG_RTE_EXEC_ENV=.*!CONFIG_RTE_EXEC_ENV=y!1' config/common_base' dpdk.spec
+sed -i '77a sed -i 's!CONFIG_RTE_BUILD_SHARED_LIB=.*!CONFIG_RTE_BUILD_SHARED_LIB=y!1' config/common_base' dpdk.spec
+sed -i '78a sed -i 's!CONFIG_RTE_LIBRTE_EAL=.*!CONFIG_RTE_LIBRTE_EAL=y!1' config/common_base' dpdk.spec
+
+echo "build the dependence"
+sudo yum-builddep -y dpdk.spec
+
+echo "generate the rpm package"
+rpmbuild -ba dpdk.spec --define "_sourcedir ${PWD}"
+
+echo "install the rpm"
+cd ../RPMS/x86_64/
+sudo rpm -ivh dpdk-16.04-1.x86_64.rpm
+sudo rpm -ivh dpdk-devel-16.04-1.x86_64.rpm
+cd ${cur_directory}