diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-06 11:20:01 +0100 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-11-06 12:03:58 +0100 |
| commit | 69e0d27467479c01a119536f4f7cef0b4bbef164 (patch) | |
| tree | 869cec15f24f8c5c07d287f050197fac57708fe7 /scripts | |
| parent | 5b2c1a9375f4c697e666aa233d32a64a060f138b (diff) | |
| download | ptxdist-69e0d27467479c01a119536f4f7cef0b4bbef164.tar.gz ptxdist-69e0d27467479c01a119536f4f7cef0b4bbef164.tar.xz | |
ptxd_install_setup_src: fix usr-merge sanity check
This check only makes sense for 'alternative' and 'config'. For all other
commands $src is a global absolute path, not a target path.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/lib/ptxd_make_xpkg_pkg.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/ptxd_make_xpkg_pkg.sh b/scripts/lib/ptxd_make_xpkg_pkg.sh index 62fb302c6..7152c7c2d 100644 --- a/scripts/lib/ptxd_make_xpkg_pkg.sh +++ b/scripts/lib/ptxd_make_xpkg_pkg.sh @@ -168,7 +168,7 @@ ptxd_install_setup_src() { ptxd_install_setup || return legacy_src="${src#/usr}" - if [ "${legacy_src}" != "${src}" ]; then + if [ \( "${cmd}" = "alternative" -o "${cmd}" = "config" \) -a "${legacy_src}" != "${src}" ]; then ptxd_install_setup_src_list "${legacy_src}" if ptxd_get_path "${list[@]}"; then local tmp |