diff options
| author | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-06-06 21:36:59 +0200 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-06-06 21:40:09 +0200 |
| commit | ff9812c546b395a9e52be50902276996777e7a86 (patch) | |
| tree | 561a7f311131d906735b79ba2feda30a2ba83dc1 /bin | |
| parent | e8710300124566bbfbc9f0bd04659e9b9ccafbde (diff) | |
| download | ptxdist-ff9812c546b395a9e52be50902276996777e7a86.tar.gz ptxdist-ff9812c546b395a9e52be50902276996777e7a86.tar.xz | |
ptxdist: fix autoversion ptxconfig handling
The autoversion was changed to pick the version from the bottom layer. This
is accomplished by temporarily using the ptxconfig from that layer.
If the version is already correct, then no new ptxdist is executed.
As a result, the ptxconfig from the bottom layer is used. This fails with:
ptxdist: error: The selected config file:
ptxdist: error: BSP/base/configs/ptxconfig
ptxdist: error: is overwritten by:
ptxdist: error: BSP/configs/ptxconfig
ptxdist: error: The config file in the outer layer must be used!
Fix this by switching back to the correct ptxconfig after fetching the
version from the config.
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index 8aeb1a543..65fdf11c6 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2488,7 +2488,7 @@ setup_parallel() { setup_auto_version() { - local configfile_version next + local configfile_version next saved_ptxconfig local -a args if [ -z "${PTXDIST_AUTOVERSION}" ]; then @@ -2524,9 +2524,11 @@ setup_auto_version() return fi # the bottom layer decides the version + saved_ptxconfig="${PTXDIST_PTXCONFIG}" PTXDIST_PTXCONFIG="${ptxd_reply[${#ptxd_reply[@]}-1]}" _get_config_ptx + PTXDIST_PTXCONFIG="${saved_ptxconfig}" if check_version "${configfile_version}"; then # this is already the correct version return |