From ca33590b6af032bff57d9cc70455660466a654b2 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 19 Feb 2018 11:16:57 +0000 Subject: New upstream version 18.02 Change-Id: I89ed24cb2a49b78fe5be6970b99dd46c1499fcc3 Signed-off-by: Luca Boccassi --- devtools/build-tags.sh | 32 ++++---------------------------- devtools/check-git-log.sh | 2 ++ devtools/check-includes.sh | 1 + devtools/checkpatches.sh | 3 ++- devtools/get-maintainer.sh | 46 +++++++++------------------------------------- devtools/test-build.sh | 8 +++++++- devtools/validate-abi.sh | 32 ++++---------------------------- 7 files changed, 29 insertions(+), 95 deletions(-) (limited to 'devtools') diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index 942da2ba..78001f04 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -1,35 +1,11 @@ #!/bin/sh -e -# Generate tags or gtags or cscope or etags files -# -# BSD LICENSE -# -# Copyright 2017 Cavium, Inc +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Cavium, Inc # -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: + # -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Cavium, Inc nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. +# Generate tags or gtags or cscope or etags files # -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. verbose=false linux=true diff --git a/devtools/check-git-log.sh b/devtools/check-git-log.sh index 910daba4..c601f6ae 100755 --- a/devtools/check-git-log.sh +++ b/devtools/check-git-log.sh @@ -124,6 +124,7 @@ bad=$(echo "$headlines" | grep -E --color=always \ -e ':.*\' \ -e ':.*\' \ -e ':.*\' \ + -e ':.*\' \ -e ':.*\' \ -e ':.*\' \ -e ':.*\' \ @@ -135,6 +136,7 @@ bad=$(echo "$headlines" | grep -E --color=always \ -e ':.*\' \ -e ':.*\' \ -e ':.*\' \ + -e ':.*\' \ -e ':.*\' \ -e ':.*\<[Vv]lan\>' \ -e ':.*\' \ diff --git a/devtools/check-includes.sh b/devtools/check-includes.sh index c4ec73f1..685a3e77 100755 --- a/devtools/check-includes.sh +++ b/devtools/check-includes.sh @@ -111,6 +111,7 @@ include_dir=${1:-build/include} 'exec-env/*' \ 'rte_vhost.h' \ 'rte_eth_vhost.h' \ + 'rte_eal_interrupts.h' \ } : ${IGNORE_CXX= \ 'rte_vhost.h' \ diff --git a/devtools/checkpatches.sh b/devtools/checkpatches.sh index a56c41a3..7676a6b5 100755 --- a/devtools/checkpatches.sh +++ b/devtools/checkpatches.sh @@ -41,7 +41,8 @@ length=${DPDK_CHECKPATCH_LINE_LENGTH:-80} options="--no-tree" options="$options --max-line-length=$length" options="$options --show-types" -options="$options --ignore=LINUX_VERSION_CODE,FILE_PATH_CHANGES,\ +options="$options --ignore=LINUX_VERSION_CODE,\ +FILE_PATH_CHANGES,MAINTAINERS_STYLE,\ VOLATILE,PREFER_PACKED,PREFER_ALIGNED,PREFER_PRINTF,\ PREFER_KERNEL_TYPES,BIT_MACRO,CONST_STRUCT,\ SPLIT_STRING,LONG_LINE_STRING,\ diff --git a/devtools/get-maintainer.sh b/devtools/get-maintainer.sh index 5ae6b5ae..904b7785 100755 --- a/devtools/get-maintainer.sh +++ b/devtools/get-maintainer.sh @@ -1,35 +1,6 @@ #!/bin/sh - -# BSD LICENSE -# -# Copyright(c) 2017 Intel Corporation. All rights reserved. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# * Neither the name of Intel Corporation nor the names of its -# contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2017 Intel Corporation # Load config options: @@ -42,15 +13,16 @@ options="$options --no-rolestats" print_usage () { cat <<- END_OF_HELP usage: $(basename $0) + + The DPDK_GETMAINTAINER_PATH variable should be set to the full path to + the get_maintainer.pl script located in Linux kernel sources. Example: + DPDK_GETMAINTAINER_PATH=~/linux/scripts/get_maintainer.pl + + Also refer to devtools/load-devel-config to store your configuration. END_OF_HELP } -# Requires DPDK_GETMAINTAINER_PATH devel config option set, -# please check devtools/load-devel-config. -# DPDK_GETMAINTAINER_PATH should be full path to the get_maintainer.pl script, -# like: -# DPDK_GETMAINTAINER_PATH=~/linux/scripts/get_maintainer.pl - +# Requires DPDK_GETMAINTAINER_PATH devel config option set if [ ! -x "$DPDK_GETMAINTAINER_PATH" ] ; then print_usage >&2 echo diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 092d3a7f..3362edcc 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -47,6 +47,7 @@ default_path=$PATH # - DPDK_DEP_ZLIB (y/[n]) # - DPDK_MAKE_JOBS (int) # - DPDK_NOTIFY (notify-send) +# - FLEXRAN_SDK # - LIBMUSDK_PATH # - LIBSSO_SNOW3G_PATH # - LIBSSO_KASUMI_PATH @@ -130,6 +131,7 @@ reset_env () unset DPDK_DEP_ZLIB unset AESNI_MULTI_BUFFER_LIB_PATH unset ARMV8_CRYPTO_LIB_PATH + unset FLEXRAN_SDK unset LIBMUSDK_PATH unset LIBSSO_SNOW3G_PATH unset LIBSSO_KASUMI_PATH @@ -157,7 +159,7 @@ config () # ! echo $3 | grep -q '+shared' || \ sed -ri 's,(SHARED_LIB=)n,\1y,' $1/.config ! echo $3 | grep -q '+debug' || ( \ - sed -ri 's,(RTE_LOG_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config + sed -ri 's,(RTE_LOG_DP_LEVEL=).*,\1RTE_LOG_DEBUG,' $1/.config sed -ri 's,(_DEBUG.*=)n,\1y,' $1/.config sed -ri 's,(_STAT.*=)n,\1y,' $1/.config sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) @@ -194,9 +196,13 @@ config () # sed -ri 's,(PMD_OPENSSL=)n,\1y,' $1/.config test "$DPDK_DEP_SSL" != y || \ sed -ri 's,(PMD_QAT=)n,\1y,' $1/.config + test -z "$FLEXRAN_SDK" || \ + sed -ri 's,(BBDEV_TURBO_SW=)n,\1y,' $1/.config sed -ri 's,(SCHED_.*=)n,\1y,' $1/.config test -z "$LIBMUSDK_PATH" || \ sed -ri 's,(PMD_MRVL_CRYPTO=)n,\1y,' $1/.config + test -z "$LIBMUSDK_PATH" || \ + sed -ri 's,(MRVL_PMD=)n,\1y,' $1/.config build_config_hook $1 $2 $3 # Explicit enabler/disabler (uppercase) diff --git a/devtools/validate-abi.sh b/devtools/validate-abi.sh index 8caf43e8..138436d9 100755 --- a/devtools/validate-abi.sh +++ b/devtools/validate-abi.sh @@ -1,32 +1,8 @@ #!/usr/bin/env bash -# BSD LICENSE -# -# Copyright(c) 2015 Neil Horman. All rights reserved. -# Copyright(c) 2017 6WIND S.A. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in -# the documentation and/or other materials provided with the -# distribution. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# SPDX-License-Identifier: BSD-3-Clause +# Copyright(c) 2015 Neil Horman. All rights reserved. +# Copyright(c) 2017 6WIND S.A. +# All rights reserved set -e -- cgit 1.2.3-korg