diff options
| author | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-17 08:49:21 +0000 |
|---|---|---|
| committer | Marc Kleine-Budde <mkl@pengutronix.de> | 2009-06-17 08:49:21 +0000 |
| commit | 5116decd325b9b3d22ada09a92e67974faa34b4a (patch) | |
| tree | c11e7b386a455b5e21f0b266385f5753eeadffec /bin | |
| parent | 7a415999cb454f198837008e563b73bf01707973 (diff) | |
| download | ptxdist-5116decd325b9b3d22ada09a92e67974faa34b4a.tar.gz ptxdist-5116decd325b9b3d22ada09a92e67974faa34b4a.tar.xz | |
[ptxdist] don't fail if config files don't define certain symbols
This patch fixes the commit
git: 0f0daf95ab605fe17d02d8daf214abf467d42549
svn: 10807
wich introduced a bug, so that projects with one of these symbols
("PTXCONF_PLATFORM, PTXCONF_PROJECT, PTXCONF_PROJECT_VERSION") missing
cannot be build.
Reported-by: Erwin Rol <erwin@erwinrol.com>
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10811 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ptxdist | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/ptxdist b/bin/ptxdist index a911b9a95..f6c9f70ec 100755 --- a/bin/ptxdist +++ b/bin/ptxdist @@ -2164,9 +2164,10 @@ setup_config() { setup_platform() { local platform project project_version - platform="$(ptxd_get_ptxconf PTXCONF_PLATFORM)" && - project="$(ptxd_get_ptxconf PTXCONF_PROJECT)" && - project_version="$(ptxd_get_ptxconf PTXCONF_PROJECT_VERSION)" || return + # ptxd_get_ptxconf's return value is + platform="$(ptxd_get_ptxconf PTXCONF_PLATFORM)" || [ ${?} -eq 1 ] && + project="$(ptxd_get_ptxconf PTXCONF_PROJECT)" || [ ${?} -eq 1 ] && + project_version="$(ptxd_get_ptxconf PTXCONF_PROJECT_VERSION)" || [ ${?} -eq 1 ] || return if [ -n "${platform}" ]; then PTXDIST_PLATFORMDIR="${PTXDIST_WORKSPACE}/platform-${platform}" |