Hi Ferruh,
Patch tested.
Thanks,
Conor.
> From: dev <dev-boun...@dpdk.org> On Behalf Of Ferruh Yigit
> Sent: Wednesday 25 November 2020 19:19
> To: Thomas Monjalon <tho...@monjalon.net>
> Cc: Yigit, Ferruh <ferruh.yi...@intel.com>; dev@dpdk.org;
> techbo...@dpdk.org; Stephen Hemminger
> <step...@networkplumber.org>; Richardson, Bruce
> <bruce.richard...@intel.com>
> Subject: [dpdk-dev] [PATCH 1/6] usertools/setup: remove make based build
>
> 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 <ferruh.yi...@intel.com>
Tested-by: Conor Walsh <conor.wa...@intel.com>
> ---
> 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
>
> --
> 2.26.2
