summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Wood <michael.g.wood@intel.com>2015-06-19 11:24:21 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-06-26 09:27:33 +0100
commit62288a66896416beaef1d85aeefc8dab0835f4f8 (patch)
treeb3a1ec12fc803bda63cfa463df6770d4466b13b5
parent10e35ab742bf1dc7eb41dde6e3423c2a77d992e6 (diff)
downloadpoky-62288a66896416beaef1d85aeefc8dab0835f4f8.tar.gz
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 <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--bitbake/lib/toaster/bldcontrol/management/commands/checksettings.py2
1 files changed, 2 insertions, 0 deletions
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):
166 conffilepath, error = subprocess.Popen('bash -c ". '+os.path.join(dirname, ".templateconf")+'; echo \"\$TEMPLATECONF\""', shell=True, stdout=subprocess.PIPE).communicate() 166 conffilepath, error = subprocess.Popen('bash -c ". '+os.path.join(dirname, ".templateconf")+'; echo \"\$TEMPLATECONF\""', shell=True, stdout=subprocess.PIPE).communicate()
167 conffilepath = os.path.join(conffilepath.strip(), "toasterconf.json") 167 conffilepath = os.path.join(conffilepath.strip(), "toasterconf.json")
168 candidatefilepath = os.path.join(dirname, conffilepath) 168 candidatefilepath = os.path.join(dirname, conffilepath)
169 if "toaster_cloned" in candidatefilepath:
170 continue
169 if os.path.exists(candidatefilepath): 171 if os.path.exists(candidatefilepath):
170 config_files.append(candidatefilepath) 172 config_files.append(candidatefilepath)
171 173