From f239aed5e674965691846e8ce3f187dd47523689 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 16 Aug 2017 18:42:05 +0100 Subject: New upstream version 17.08 Change-Id: I288b50990f52646089d6b1f3aaa6ba2f091a51d7 Signed-off-by: Luca Boccassi --- devtools/build-tags.sh | 4 ++-- devtools/check-dup-includes.sh | 37 +++++++++++++++++++++++++++++++++++++ devtools/check-maintainers.sh | 3 +++ devtools/cocci/mtod-offset.cocci | 2 +- devtools/git-log-fixes.sh | 2 +- devtools/test-build.sh | 10 ++++------ devtools/validate-abi.sh | 4 ++-- 7 files changed, 50 insertions(+), 12 deletions(-) create mode 100755 devtools/check-dup-includes.sh (limited to 'devtools') diff --git a/devtools/build-tags.sh b/devtools/build-tags.sh index 0db406d6..942da2ba 100755 --- a/devtools/build-tags.sh +++ b/devtools/build-tags.sh @@ -3,7 +3,7 @@ # # BSD LICENSE # -# Copyright 2017 Cavium Networks +# Copyright 2017 Cavium, Inc # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -15,7 +15,7 @@ # 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 networks nor the names of its +# * 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. # diff --git a/devtools/check-dup-includes.sh b/devtools/check-dup-includes.sh new file mode 100755 index 00000000..10365e4a --- /dev/null +++ b/devtools/check-dup-includes.sh @@ -0,0 +1,37 @@ +#! /bin/sh -e + +# Copyright 2017 Mellanox Technologies, Ltd. 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. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +# IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY +# CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +# TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +# SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +# Check C files in git repository for duplicated includes. +# Usage: devtools/check-dup-includes.sh [directory] + +dir=${1:-$(dirname $(readlink -m $0))/..} +cd $dir + +# speed up by ignoring Unicode details +export LC_ALL=C + +for file in $(git ls-files '*.[ch]') ; do + sed -rn 's,^[[:space:]]*#include[[:space:]]*[<"](.*)[>"].*,\1,p' $file | + sort | uniq -d | + sed "s,^,$file: duplicated include: ," +done diff --git a/devtools/check-maintainers.sh b/devtools/check-maintainers.sh index 69c879a8..ac5326b8 100755 --- a/devtools/check-maintainers.sh +++ b/devtools/check-maintainers.sh @@ -34,6 +34,9 @@ cd $(dirname $0)/.. +# speed up by ignoring Unicode details +export LC_ALL=C + # Get files matching paths with wildcards and / meaning recursing files () # [ ...] { diff --git a/devtools/cocci/mtod-offset.cocci b/devtools/cocci/mtod-offset.cocci index 13134e9d..3f83f322 100644 --- a/devtools/cocci/mtod-offset.cocci +++ b/devtools/cocci/mtod-offset.cocci @@ -55,7 +55,7 @@ expression M, O1, O2; // -// Cleanup rules. Fold in double casts, remove unnecessary paranthesis, etc. +// Cleanup rules. Fold in double casts, remove unnecessary parenthesis, etc. // @disable paren@ expression M, O; diff --git a/devtools/git-log-fixes.sh b/devtools/git-log-fixes.sh index 74049467..58006874 100755 --- a/devtools/git-log-fixes.sh +++ b/devtools/git-log-fixes.sh @@ -66,7 +66,7 @@ range="$*" # get major release version of a commit commit_version () # { - tag=$(git tag -l --contains $1 | head -n1) + tag=$(git tag -l --contains $1 --merged | head -n1) if [ -z "$tag" ] ; then # before -rc1 tag of release in progress make showversion | cut -d'.' -f-2 diff --git a/devtools/test-build.sh b/devtools/test-build.sh index 61bdce7c..c6dfaf0a 100755 --- a/devtools/test-build.sh +++ b/devtools/test-build.sh @@ -38,10 +38,9 @@ default_path=$PATH # - DPDK_BUILD_TEST_CONFIGS (defconfig1+option1+option2 defconfig2) # - DPDK_DEP_ARCHIVE # - DPDK_DEP_CFLAGS -# - DPDK_DEP_ISAL_CRYPTO (y/[n]) # - DPDK_DEP_LDFLAGS # - DPDK_DEP_MOFED (y/[n]) -# - DPDK_DEP_NUMA (y/[n]) +# - DPDK_DEP_NUMA ([y]/n) # - DPDK_DEP_PCAP (y/[n]) # - DPDK_DEP_SSL (y/[n]) # - DPDK_DEP_SZE (y/[n]) @@ -121,7 +120,6 @@ reset_env () unset CROSS unset DPDK_DEP_ARCHIVE unset DPDK_DEP_CFLAGS - unset DPDK_DEP_ISAL_CRYPTO unset DPDK_DEP_LDFLAGS unset DPDK_DEP_MOFED unset DPDK_DEP_NUMA @@ -163,8 +161,8 @@ config () # sed -ri 's,(TEST_PMD_RECORD_.*=)n,\1y,' $1/.config ) # Automatic configuration - test "$DPDK_DEP_NUMA" != y || \ - sed -ri 's,(NUMA=)n,\1y,' $1/.config + test "$DPDK_DEP_NUMA" != n || \ + sed -ri 's,(NUMA.*=)y,\1n,' $1/.config sed -ri 's,(LIBRTE_IEEE1588=)n,\1y,' $1/.config sed -ri 's,(BYPASS=)n,\1y,' $1/.config test "$DPDK_DEP_ARCHIVE" != y || \ @@ -182,7 +180,7 @@ config () # sed -ri 's,(PMD_ARMV8_CRYPTO=)n,\1y,' $1/.config test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \ sed -ri 's,(PMD_AESNI_MB=)n,\1y,' $1/.config - test "$DPDK_DEP_ISAL_CRYPTO" != y || \ + test -z "$AESNI_MULTI_BUFFER_LIB_PATH" || \ sed -ri 's,(PMD_AESNI_GCM=)n,\1y,' $1/.config test -z "$LIBSSO_SNOW3G_PATH" || \ sed -ri 's,(PMD_SNOW3G=)n,\1y,' $1/.config diff --git a/devtools/validate-abi.sh b/devtools/validate-abi.sh index 52e4e7ae..0accc99b 100755 --- a/devtools/validate-abi.sh +++ b/devtools/validate-abi.sh @@ -150,14 +150,14 @@ TAG2="$TAG2 ($HASH2)" ABICHECK=`which abi-compliance-checker 2>/dev/null` if [ $? -ne 0 ] then - log "INFO" "Cant find abi-compliance-checker utility" + log "INFO" "Can't find abi-compliance-checker utility" cleanup_and_exit 1 fi ABIDUMP=`which abi-dumper 2>/dev/null` if [ $? -ne 0 ] then - log "INFO" "Cant find abi-dumper utility" + log "INFO" "Can't find abi-dumper utility" cleanup_and_exit 1 fi -- cgit 1.2.3-korg