diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-18 17:40:54 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2018-09-20 11:03:54 +0200 |
| commit | 033b4c881b2b195f40187762358caba04abd36df (patch) | |
| tree | a09117bf5169475c95c13c148f73ab158f73ab84 /scripts/libptxdist.sh | |
| parent | f14b144f134a398d28ff3786a7f399090aa29594 (diff) | |
| download | ptxdist-033b4c881b2b195f40187762358caba04abd36df.tar.gz ptxdist-033b4c881b2b195f40187762358caba04abd36df.tar.xz | |
ptxd_print_path: handle layers correctly
'oldconfig' is executed recursivly. Each time, the last layer is removed
from PTXDIST_PATH. As a result, ptxd_print_path will produce paths starting
with 'base/' in the current layer.
Also, any platformconfigdir or layer paths are not used anyways, because
the workspace matches first.
So just use the workspace and topdir explicitly.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'scripts/libptxdist.sh')
| -rw-r--r-- | scripts/libptxdist.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/libptxdist.sh b/scripts/libptxdist.sh index f28439961..cd59e5dd8 100644 --- a/scripts/libptxdist.sh +++ b/scripts/libptxdist.sh @@ -670,7 +670,7 @@ ptxd_print_path() { fi local path out - for path in ${PTXDIST_PATH//:/ }; do + for path in ${PTXDIST_WORKSPACE} ${PTXDIST_TOPDIR}; do path="${path%/*}/" out="${1/#${path}}" if [ "${out}" != "${1}" ]; then |