diff options
| author | Elliot Smith <elliot.smith@intel.com> | 2015-12-09 19:56:26 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-14 23:13:06 +0000 |
| commit | 8ca46641ef9abd31002f9de75b8dea1f2916f34d (patch) | |
| tree | 1b00a123b569851c030ca27a23880a87b642260d /bitbake/bin/toaster | |
| parent | b322dec01642a61584a11638a97341126dc3dd3f (diff) | |
| download | poky-8ca46641ef9abd31002f9de75b8dea1f2916f34d.tar.gz | |
bitbake: toaster: Upgrade to Django 1.8.6 and remove South
Upgrade Django to long-term support version.
Django now provides its own migration framework, so remove
requirement for South.
[YOCTO #8364]
(Bitbake rev: 648b62654c52116451c6a68a46d7264db3a34d09)
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/toaster')
| -rwxr-xr-x | bitbake/bin/toaster | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 6d1ec0573a..528e17e41f 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster | |||
| @@ -176,15 +176,11 @@ notify_chldexit() { | |||
| 176 | verify_prereq() { | 176 | verify_prereq() { |
| 177 | # Verify prerequisites | 177 | # Verify prerequisites |
| 178 | 178 | ||
| 179 | if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (6,)" | python 2>/dev/null | grep True >/dev/null; then | 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 |
| 180 | printf "This program needs Django 1.6. Please install with\n\npip install django==1.6\n" | 180 | printf "This program needs Django 1.8. Please install with\n\npip install django<=1.8.7\n" |
| 181 | return 2 | 181 | return 2 |
| 182 | fi | 182 | fi |
| 183 | 183 | ||
| 184 | if ! echo "import south; print reduce(lambda x, y: 2 if x==2 else 0 if x == 0 else y, map(lambda x: 1+cmp(x[1]-x[0],0), zip([0,8,4], map(int,south.__version__.split(\".\"))))) > 0" | python 2>/dev/null | grep True >/dev/null; then | ||
| 185 | printf "This program needs South 0.8.4. Please install with\n\npip install south==0.8.4\n" | ||
| 186 | return 2 | ||
| 187 | fi | ||
| 188 | return 0 | 184 | return 0 |
| 189 | } | 185 | } |
| 190 | 186 | ||
