Drop d/p/make-load-devel-config-not-to-appear-as-executable.patch (is upstream)

Change-Id: Id715e87fc1a7e784d274d17a0a2a14ff208ea4ec
Signed-off-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>

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
deleted file mode 100644 (file)
index 0493053..0000000
--- a/debian/patches/make-load-devel-config-not-to-appear-as-executable.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-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 62de9ac..908e224 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 fix-vhost-user-socket-permission.patch
-make-load-devel-config-not-to-appear-as-executable.patch
 rte-compile-pre-cppflags.patch
 fix-power-default-config.patch
 rte-devel-build-env.patch