summaryrefslogtreecommitdiffstats
path: root/bitbake/bin
diff options
context:
space:
mode:
authorElliot Smith <elliot.smith@intel.com>2015-12-09 19:56:35 -0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-12-14 23:13:07 +0000
commit0adffdf790e40ec865d790d137fab56aea674060 (patch)
tree9e4c06bca0c98234fa72a684143a59636149cbdb /bitbake/bin
parent8d058cfb8f81018036bff827d7ec14653a104806 (diff)
downloadpoky-0adffdf790e40ec865d790d137fab56aea674060.tar.gz
bitbake: toaster: Check Django version against toaster-requirements.txt
Instead of hard-coding the required Django version in the start script, look it up from the toaster-requirements.txt file. [YOCTO #8364] (Bitbake rev: 2149ff805424692f9fde29618f2ae0eb99f710d2) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/bin')
-rwxr-xr-xbitbake/bin/toaster10
1 files changed, 8 insertions, 2 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index e3c78675dc..0862a3548a 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -175,9 +175,15 @@ notify_chldexit() {
175 175
176verify_prereq() { 176verify_prereq() {
177 # Verify prerequisites 177 # Verify prerequisites
178 regex="([0-9])\.([0-9])"
179 for line in `cat $BBBASEDIR/toaster-requirements.txt | grep Django` ; do
180 [[ `echo $line` =~ $regex ]]
181 required_major_version="${BASH_REMATCH[1]}"
182 required_minor_version="${BASH_REMATCH[2]}"
183 done
178 184
179 if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (8,)" | python 2>/dev/null | grep True >/dev/null; then 185 if ! echo "import django; print ($required_major_version,) == django.VERSION[0:1] and django.VERSION[1:2][0] in ($required_minor_version,)" | python 2>/dev/null | grep True >/dev/null; then
180 printf "This program needs Django 1.8. Please install with\n\npip install django<=1.8.7\n" 186 printf "This program needs Django $required_major_version.$required_minor_version. Please install with\n\npip install -r $BBBASEDIR/toaster-requirements.txt\n"
181 return 2 187 return 2
182 fi 188 fi
183 189