From c7473ce145c093501ceb0d5aa64487588d43db20 Mon Sep 17 00:00:00 2001
From: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Date: Wed, 3 Aug 2016 16:11:06 +0200
Subject: scripts: make load-devel-config not to appear as 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.

Backport of http://dpdk.org/dev/patchwork/patch/15100/
Already got an ack to be commited, but no git commit id yet.

Change-Id: Iadad8b2454feb82361731fce19928b395b256fa2
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
---
 debian/changelog                                   |  3 +
 ...-devel-config-not-to-appear-as-executable.patch | 86 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 90 insertions(+)
 create mode 100644 debian/patches/make-load-devel-config-not-to-appear-as-executable.patch

diff --git a/debian/changelog b/debian/changelog
index 1c03ef79..18bd2e75 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,9 @@ dpdk (16.07-1) UNRELEASED; urgency=medium
     These binaries are part of the sdk and meant to be shipped with the sdk.
   * d/p/dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch to fix the
     docs in regard to 16.07 changes renaming dpdk_nic_bind
+  * d/p/make-load-devel-config-not-to-appear-as-executable.patch to avoid
+    accidentially executing as script and to fix unusual-interpreter lintian
+    warning.
 
   [ Anders Roxell ]
   * debian/control: add pciutils to the dpdk depends list, since lspci is used
diff --git a/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch b/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch
new file mode 100644
index 00000000..04930536
--- /dev/null
+++ b/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch
@@ -0,0 +1,86 @@
+Description: scripts: make load-devel-config not to appear as 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 <christian.ehrhardt@canonical.com>
+
+Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15100/
+Author: Christian Ehrhardt <christian.ehrhardt@canonical.com>
+Last-Update: 2016-08-03
+
+--- a/MAINTAINERS
++++ b/MAINTAINERS
+@@ -27,7 +27,7 @@
+ 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
+--- 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}
+ 
+--- /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
+--- 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
+--- a/scripts/test-build.sh
++++ b/scripts/test-build.sh
+@@ -48,7 +48,7 @@
+ # - 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 @@
+ 	# 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
diff --git a/debian/patches/series b/debian/patches/series
index 6840080d..1a805527 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-vhost-user-socket-permission.patch
 fix-double-license-info.patch
 fix-unusual-interpreter.patch
 dpdk-dev-doc-fix-old-dpdk-nic-bind.py-references.patch
+make-load-devel-config-not-to-appear-as-executable.patch
-- 
cgit 1.2.3-korg