diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-09-22 10:48:56 +0200 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2010-09-22 12:07:00 +0200 |
| commit | e6eecd1eb5e7c1fc45749e93943620a0a9948c48 (patch) | |
| tree | 682a80dff12ef377866baf12d9bcdf7880bd371a | |
| parent | ac97e77eedf7df6b7d12fc227e988ed398070772 (diff) | |
| download | ptxdist-e6eecd1eb5e7c1fc45749e93943620a0a9948c48.tar.gz ptxdist-e6eecd1eb5e7c1fc45749e93943620a0a9948c48.tar.xz | |
ptxd_install_setup_src: only use {pkg_,}pkg_dir if set
In some packages <PKG>_DIR might be unset, so don't use $pkg_dir
to find files during install_alterlative if it's unset. This
might result in using files from the host system.
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index d57041aff..bcb137094 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -55,13 +55,17 @@ ptxd_install_setup_src() { local -a list if [ "${cmd}" = "alternative" ]; then + # + # if pkg_dir is empty we'll have some some empty entries in + # the array, but that's no problem for the "-e" below. + # list=( \ "${PTXDIST_WORKSPACE}/projectroot${PTXDIST_PLATFORMSUFFIX}${src}" \ "${PTXDIST_WORKSPACE}/projectroot${src}${PTXDIST_PLATFORMSUFFIX}" \ "${PTXDIST_WORKSPACE}/projectroot${src}" \ "${PTXDIST_TOPDIR}/generic${src}" \ - "${pkg_pkg_dir}${src}" \ - "${pkg_dir}${src}" \ + "${pkg_pkg_dir:+${pkg_pkg_dir}${src}}" \ + "${pkg_dir:+${pkg_dir}${src}}" \ ) else list=( \ |