From cc0ee4d5377db2c34a0e5db8effd36910ce51569 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Wed, 3 Aug 2016 16:59:00 +0200
Subject: [PATCH] scripts: convert devel config helper as simple file

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 <christian.ehrhardt@canonical.com>
---
 MAINTAINERS                                         | 2 +-
 scripts/checkpatches.sh                             | 2 +-
 scripts/{load-devel-config.sh => load-devel-config} | 2 --
 scripts/test-build.sh                               | 4 ++--
 4 files changed, 4 insertions(+), 6 deletions(-)
 rename scripts/{load-devel-config.sh => load-devel-config} (92%)
 mode change 100755 => 100644

diff --git a/MAINTAINERS b/MAINTAINERS
index 5e3d8255e8..bc9aa0223b 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 7111558f37..b596b4e055 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.sh b/scripts/load-devel-config
old mode 100755
new mode 100644
similarity index 92%
rename from scripts/load-devel-config.sh
rename to scripts/load-devel-config
index 489f007581..4f43cb3523
--- a/scripts/load-devel-config.sh
+++ b/scripts/load-devel-config
@@ -1,5 +1,3 @@
-#! /bin/echo must be loaded with .
-
 # Load DPDK devel config and allow override
 # from system file
 test ! -r /etc/dpdk/devel.config ||
diff --git a/scripts/test-build.sh b/scripts/test-build.sh
index d2cafc19bf..e8971fef3f 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
-- 
2.20.1