From patchwork Wed Aug 3 14:59:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Ehrhardt X-Patchwork-Id: 15113 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 7EB78530C; Wed, 3 Aug 2016 16:59:03 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by dpdk.org (Postfix) with ESMTP id 849EA37A4 for ; Wed, 3 Aug 2016 16:59:02 +0200 (CEST) Received: from 1.general.paelzer.uk.vpn ([10.172.196.172] helo=localhost.localdomain) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1bUxdO-0002db-4g; Wed, 03 Aug 2016 14:59:02 +0000 From: Christian Ehrhardt To: christian.ehrhardt@canonical.com, thomas.monjalon@6wind.com, dev@dpdk.org Date: Wed, 3 Aug 2016 16:59:00 +0200 Message-Id: <1470236340-21752-1-git-send-email-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Subject: [dpdk-dev] [PATCH v2] scripts: make load-devel-config not to appear as executable X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" *Updates in v2* - drop the #!/bin/echo now that it is no more executable Quoting the first line of the script: "#! /bin/echo must be loaded with ." Given that we should drop the .sh file ending as well as the executable flag - both are not needed to source the file. Signed-off-by: Christian Ehrhardt --- MAINTAINERS | 2 +- scripts/checkpatches.sh | 2 +- scripts/load-devel-config | 12 ++++++++++++ scripts/load-devel-config.sh | 14 -------------- scripts/test-build.sh | 4 ++-- 5 files changed, 16 insertions(+), 18 deletions(-) create mode 100644 scripts/load-devel-config delete mode 100755 scripts/load-devel-config.sh diff --git a/MAINTAINERS b/MAINTAINERS index 6536c6b..f8b99ee 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -27,7 +27,7 @@ F: MAINTAINERS F: scripts/check-maintainers.sh F: scripts/check-git-log.sh F: scripts/checkpatches.sh -F: scripts/load-devel-config.sh +F: scripts/load-devel-config F: scripts/test-build.sh Stable Branches diff --git a/scripts/checkpatches.sh b/scripts/checkpatches.sh index 7111558..b596b4e 100755 --- a/scripts/checkpatches.sh +++ b/scripts/checkpatches.sh @@ -33,7 +33,7 @@ # Load config options: # - DPDK_CHECKPATCH_PATH # - DPDK_CHECKPATCH_LINE_LENGTH -. $(dirname $(readlink -e $0))/load-devel-config.sh +. $(dirname $(readlink -e $0))/load-devel-config length=${DPDK_CHECKPATCH_LINE_LENGTH:-80} diff --git a/scripts/load-devel-config b/scripts/load-devel-config new file mode 100644 index 0000000..4f43cb3 --- /dev/null +++ b/scripts/load-devel-config @@ -0,0 +1,12 @@ +# Load DPDK devel config and allow override +# from system file +test ! -r /etc/dpdk/devel.config || + . /etc/dpdk/devel.config +# from user file +test ! -r ~/.config/dpdk/devel.config || + . ~/.config/dpdk/devel.config +# from local file +test ! -r $(dirname $(readlink -m $0))/../.develconfig || + . $(dirname $(readlink -m $0))/../.develconfig + +# The config files must export variables in the shell style diff --git a/scripts/load-devel-config.sh b/scripts/load-devel-config.sh deleted file mode 100755 index 489f007..0000000 --- a/scripts/load-devel-config.sh +++ /dev/null @@ -1,14 +0,0 @@ -#! /bin/echo must be loaded with . - -# Load DPDK devel config and allow override -# from system file -test ! -r /etc/dpdk/devel.config || - . /etc/dpdk/devel.config -# from user file -test ! -r ~/.config/dpdk/devel.config || - . ~/.config/dpdk/devel.config -# from local file -test ! -r $(dirname $(readlink -m $0))/../.develconfig || - . $(dirname $(readlink -m $0))/../.develconfig - -# The config files must export variables in the shell style diff --git a/scripts/test-build.sh b/scripts/test-build.sh index d2cafc1..e8971fe 100755 --- a/scripts/test-build.sh +++ b/scripts/test-build.sh @@ -48,7 +48,7 @@ default_path=$PATH # - DPDK_NOTIFY (notify-send) # - LIBSSO_SNOW3G_PATH # - LIBSSO_KASUMI_PATH -. $(dirname $(readlink -e $0))/load-devel-config.sh +. $(dirname $(readlink -e $0))/load-devel-config print_usage () { echo "usage: $(basename $0) [-h] [-jX] [-s] [config1 [config2] ...]]" @@ -211,7 +211,7 @@ for conf in $configs ; do # reload config with DPDK_TARGET set DPDK_TARGET=$target reset_env - . $(dirname $(readlink -e $0))/load-devel-config.sh + . $(dirname $(readlink -e $0))/load-devel-config options=$(echo $conf | sed 's,[^~+]*,,') dir=$conf