diff options
author | David Reyna <David.Reyna@windriver.com> | 2023-08-28 01:45:19 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-08-30 10:41:54 +0100 |
commit | 6553377beaded3fa7841dd2da4d4d0a0d04cffce (patch) | |
tree | 749a4e9178a9ece3e461c4cc32483fc921fcf6ed /bitbake/lib/toaster/orm | |
parent | 9ccaee95d6afc65d528b469d16b4719733768ef6 (diff) | |
download | poky-6553377beaded3fa7841dd2da4d4d0a0d04cffce.tar.gz |
bitbake: toaster: import only used layers
If you import a build directory, Toaster still adds openembedded-core,
meta-poky and meta-yocto-bsp to the newly created project. Toaster
should only be including in the project the layers that it imported.
[YOCTO #13764]
(Bitbake rev: e73c4d7685a3bd6b806a8f1a3600a3a86266f0b6)
Signed-off-by: Kieran McNulty <Kieran.McNulty@windriver.com>
Signed-off-by: David Reyna <David.Reyna@windriver.com>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/toaster/orm')
-rw-r--r-- | bitbake/lib/toaster/orm/models.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/bitbake/lib/toaster/orm/models.py b/bitbake/lib/toaster/orm/models.py index 2cb7d7e049..f9fcf9e4fb 100644 --- a/bitbake/lib/toaster/orm/models.py +++ b/bitbake/lib/toaster/orm/models.py | |||
@@ -107,7 +107,7 @@ class ToasterSetting(models.Model): | |||
107 | 107 | ||
108 | 108 | ||
109 | class ProjectManager(models.Manager): | 109 | class ProjectManager(models.Manager): |
110 | def create_project(self, name, release, existing_project=None): | 110 | def create_project(self, name, release, existing_project=None, imported=False): |
111 | if existing_project and (release is not None): | 111 | if existing_project and (release is not None): |
112 | prj = existing_project | 112 | prj = existing_project |
113 | prj.bitbake_version = release.bitbake_version | 113 | prj.bitbake_version = release.bitbake_version |
@@ -134,19 +134,19 @@ class ProjectManager(models.Manager): | |||
134 | 134 | ||
135 | if release is None: | 135 | if release is None: |
136 | return prj | 136 | return prj |
137 | 137 | if not imported: | |
138 | for rdl in release.releasedefaultlayer_set.all(): | 138 | for rdl in release.releasedefaultlayer_set.all(): |
139 | lv = Layer_Version.objects.filter( | 139 | lv = Layer_Version.objects.filter( |
140 | layer__name=rdl.layer_name, | 140 | layer__name=rdl.layer_name, |
141 | release=release).first() | 141 | release=release).first() |
142 | 142 | ||
143 | if lv: | 143 | if lv: |
144 | ProjectLayer.objects.create(project=prj, | 144 | ProjectLayer.objects.create(project=prj, |
145 | layercommit=lv, | 145 | layercommit=lv, |
146 | optional=False) | 146 | optional=False) |
147 | else: | 147 | else: |
148 | logger.warning("Default project layer %s not found" % | 148 | logger.warning("Default project layer %s not found" % |
149 | rdl.layer_name) | 149 | rdl.layer_name) |
150 | 150 | ||
151 | return prj | 151 | return prj |
152 | 152 | ||