From: Dave Wallace Date: Sat, 14 May 2016 02:49:36 +0000 (-0400) Subject: VPP-64: Fix top-level "make pkg-deb" which breaks if CDPATH is set in the user's X-Git-Tag: v16.06-rc1~9 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=9c5b2b301c1a2cc39b76c4a9570ce18a5eaa37be;p=vpp.git VPP-64: Fix top-level "make pkg-deb" which breaks if CDPATH is set in the user's bash environment. Change-Id: Ib13e6fdafa67175937e57fad4e75e553cb1e08a3 Signed-off-by: Dave Wallace --- diff --git a/build-root/scripts/find-dpdk-contents b/build-root/scripts/find-dpdk-contents index f8c80b5bf81..c7065139e0a 100755 --- a/build-root/scripts/find-dpdk-contents +++ b/build-root/scripts/find-dpdk-contents @@ -5,6 +5,15 @@ rm -rf dpdk-includes mkdir dpdk-includes (cd $1/dpdk/include; tar cfh - . | (cd ../../../dpdk-includes; tar xf -)) +# If CDPATH is set, the "Change Directory" builtin (cd) will output the +# destination directory when a relative path is passed as an argument. +# In this case, this has the negative side effect of polluting the "paths" +# variable with the destination directory, breaking the package generation. +# +# Patient: Doctor! Doctor! It hurts when I do this... +# Doctor: Don't do that! +# +unset CDPATH paths=`cd dpdk-includes; find . -type f -print` rm -f $2