From 62288a66896416beaef1d85aeefc8dab0835f4f8 Mon Sep 17 00:00:00 2001 From: Michael Wood Date: Fri, 19 Jun 2015 11:24:21 +0100 Subject: bitbake: toaster: bldcontrol Ignore toasterconf files in own directories If toaster has previously cloned poky or a layer with a toasterconf file we don't want this to be picked up as a choice as these clones are "internal" to toaster and may have undesired effects on toaster's setup. [YOCTO #7741] (Bitbake rev: 2f74ff59f2873c1cf121f7a385f3ab971c793a9c) Signed-off-by: Michael Wood Signed-off-by: Richard Purdie --- bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py index 3c524464fa..3002e4c2a9 100644 --- a/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py +++ b/bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py @@ -166,6 +166,8 @@ class Command(NoArgsCommand): conffilepath, error = subprocess.Popen('bash -c ". '+os.path.join(dirname, ".templateconf")+'; echo \"\$TEMPLATECONF\""', shell=True, stdout=subprocess.PIPE).communicate() conffilepath = os.path.join(conffilepath.strip(), "toasterconf.json") candidatefilepath = os.path.join(dirname, conffilepath) + if "toaster_cloned" in candidatefilepath: + continue if os.path.exists(candidatefilepath): config_files.append(candidatefilepath) -- cgit v1.2.3-54-g00ecf