summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Kleine-Budde <mkl@pengutronix.de>2010-06-11 14:30:13 +0200
committerMarc Kleine-Budde <mkl@pengutronix.de>2010-06-11 14:46:46 +0200
commit33695f2c110fd5789556f84d35e54301964683cb (patch)
tree2b5529e79761c2950747a8853c7b30c0bb59a900
parent383e59fe23c296417824d9e56f1d517cc171ee4f (diff)
downloadptxdist-2010.06.1.tar.gz
ptxdist-2010.06.1.tar.xz
[ptxdist] fix version check, bail out if using two incompatible releasesptxdist-2010.06.1
This patch fixes a problem with the version check. ptxdist should refuse to build a BSP() made for a different ptxdist release. Without this patch ptxdist will build a BSP for 2010.04.0 with ptxdist 2010.05.0. Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> (cherry picked from commit e2427ae908a7b58fcd4e568cc98fea17d6f03a5e) Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
-rwxr-xr-xbin/ptxdist2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/ptxdist b/bin/ptxdist
index fda077008..71ec41c35 100755
--- a/bin/ptxdist
+++ b/bin/ptxdist
@@ -224,7 +224,7 @@ check_version() {
#
# If not the developer has to fix it :P
#
- if [ "${PTXDIST_VERSION_SCM:+-git}" = "${config_scm:+-git}" ]; then
+ if [ -n "${PTXDIST_VERSION_SCM}" -a -n "${config_scm}" ]; then
return 0
fi