From patchwork Wed Nov 25 19:19:03 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 84553 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id ABD84A0545; Wed, 25 Nov 2020 20:19:40 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E65F4C966; Wed, 25 Nov 2020 20:19:21 +0100 (CET) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 349F0C956; Wed, 25 Nov 2020 20:19:19 +0100 (CET) IronPort-SDR: py4Fo7Pt3oVxsjrFp817Gx3P/cFKWXvRusLrEKrgI6vCIqX+oDCf+svrwcQs+cpBGF3QH+/qZX mqw1la6F1dCw== X-IronPort-AV: E=McAfee;i="6000,8403,9816"; a="151447607" X-IronPort-AV: E=Sophos;i="5.78,370,1599548400"; d="scan'208";a="151447607" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga005.jf.intel.com ([10.7.209.41]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Nov 2020 11:19:18 -0800 IronPort-SDR: oOdSntxzqMFDOkp2vBxK0DT93QfuC+wVeGSQS5YAGk8UEPpsUNHazdnokH9mozXh73QCBFRZ9A bIA7bUnpFjnA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,370,1599548400"; d="scan'208";a="547413771" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.180]) by orsmga005.jf.intel.com with ESMTP; 25 Nov 2020 11:19:15 -0800 From: Ferruh Yigit To: Thomas Monjalon Cc: Ferruh Yigit , dev@dpdk.org, techboard@dpdk.org, Stephen Hemminger , Bruce Richardson Date: Wed, 25 Nov 2020 19:19:03 +0000 Message-Id: <20201125191908.1867106-2-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20201125191908.1867106-1-ferruh.yigit@intel.com> References: <20201125191908.1867106-1-ferruh.yigit@intel.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH 1/6] usertools/setup: remove make based build X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" DPDK build system is switched to 'meson' based build, please check the documentation for details: "doc/guides/linux_gsg/build_dpdk.rst" Signed-off-by: Ferruh Yigit Tested-by: Conor Walsh --- usertools/dpdk-setup.sh | 74 +++-------------------------------------- 1 file changed, 4 insertions(+), 70 deletions(-) diff --git a/usertools/dpdk-setup.sh b/usertools/dpdk-setup.sh index 411bf2e07f5e..d1eb188692a6 100755 --- a/usertools/dpdk-setup.sh +++ b/usertools/dpdk-setup.sh @@ -36,53 +36,6 @@ q() quit } -# -# Sets up environmental variables for ICC. -# -setup_icc() -{ - DEFAULT_PATH=/opt/intel/bin/iccvars.sh - param=$1 - shpath=`which iccvars.sh 2> /dev/null` - if [ $? -eq 0 ] ; then - echo "Loading iccvars.sh from $shpath for $param" - source $shpath $param - elif [ -f $DEFAULT_PATH ] ; then - echo "Loading iccvars.sh from $DEFAULT_PATH for $param" - source $DEFAULT_PATH $param - else - echo "## ERROR: cannot find 'iccvars.sh' script to set up ICC." - echo "## To fix, please add the directory that contains" - echo "## iccvars.sh to your 'PATH' environment variable." - quit - fi -} - -# -# Sets RTE_TARGET and does a "make install". -# -setup_target() -{ - option=$1 - export RTE_TARGET=${TARGETS[option]} - - compiler=${RTE_TARGET##*-} - if [ "$compiler" == "icc" ] ; then - platform=${RTE_TARGET%%-*} - if [ "$platform" == "x86_64" ] ; then - setup_icc intel64 - else - setup_icc ia32 - fi - fi - if [ "$QUIT" == "0" ] ; then - make install T=${RTE_TARGET} - fi - echo "------------------------------------------------------------------------------" - echo " RTE_TARGET exported as $RTE_TARGET" - echo "------------------------------------------------------------------------------" -} - # # Creates hugepage filesystem. # @@ -456,28 +409,10 @@ unbind_devices() sudo ${RTE_SDK}/usertools/dpdk-devbind.py -b $DRV $PCI_PATH && echo "OK" } -# -# Options for building a target. Note that this step MUST be first as it sets -# up TARGETS[] starting from 1, and this is accessed in setup_target using the -# user entered option. -# -step1_func() -{ - TITLE="Select the DPDK environment to build" - CONFIG_NUM=1 - for cfg in config/defconfig_* ; do - cfg=${cfg/config\/defconfig_/} - TEXT[$CONFIG_NUM]="$cfg" - TARGETS[$CONFIG_NUM]=$cfg - FUNC[$CONFIG_NUM]="setup_target" - let "CONFIG_NUM+=1" - done -} - # # Options for setting up environment. # -step2_func() +step1_func() { TITLE="Setup linux environment" @@ -512,7 +447,7 @@ step2_func() # # Options for running applications. # -step3_func() +step2_func() { TITLE="Run test application for linux environment" @@ -526,7 +461,7 @@ step3_func() # # Other options # -step4_func() +step3_func() { TITLE="Other tools" @@ -538,7 +473,7 @@ step4_func() # # Options for cleaning up the system # -step5_func() +step4_func() { TITLE="Uninstall and system cleanup" @@ -562,7 +497,6 @@ STEPS[1]="step1_func" STEPS[2]="step2_func" STEPS[3]="step3_func" STEPS[4]="step4_func" -STEPS[5]="step5_func" QUIT=0