From 0b6859cdf3a4b66bb8b94361681a5b6b362f93ae Mon Sep 17 00:00:00 2001 From: Alexandru DAMIAN Date: Fri, 14 Nov 2014 17:07:06 +0000 Subject: bitbake: toastergui: layer name correlation This patch modifies how layers are identified and matched. Layers were primarely organized by the source of layer information, and Releases were separated by both layer git branches and originating source of layer information. This setup prevented mixing layers from different sources for a certain release, which didn't match the way people use Yocto Project / bitbake. This patch brings name-based indentification, where layers with the same name are assumed to be equivalent, in the sense of being able to substitute one another. To facilitate this identification to humans, layers are differentiated by GIT URI instead of layer sources, which was a rather arbitrary abstraction. Additional changes include modification to models in order accomodate for the new data structure, and to config file loading to match the new toasterconf.json layout. (Bitbake rev: 4357200aed522ad56cfd84917f877645b83b6a70) Signed-off-by: Alexandru DAMIAN Signed-off-by: Richard Purdie --- bitbake/bin/toaster | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'bitbake/bin') diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster index 75f31d032e..7511012552 100755 --- a/bitbake/bin/toaster +++ b/bitbake/bin/toaster @@ -126,7 +126,6 @@ function notify_chldexit() { } - # Verify prerequisites if ! echo "import django; print (1,) == django.VERSION[0:1] and django.VERSION[1:2][0] in (5,6)" | python 2>/dev/null | grep True >/dev/null; then @@ -139,6 +138,7 @@ if ! echo "import south; print [0,8,4] == map(int,south.__version__.split(\".\" return 2 fi + # read command line parameters BBBASEDIR=`dirname ${BASH_SOURCE}`/.. -- cgit v1.2.3-54-g00ecf