diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-12-09 19:56:38 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-14 23:13:07 +0000 |
commit | 84daa40bc7600df75d93db358be94cac10452936 (patch) | |
tree | d23c913ca773bd04720e0cbfe6a98a199cee3dec /bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |
parent | c464f34d5bd3aa4119aa3d1591ee7d55afe9b35f (diff) | |
download | poky-84daa40bc7600df75d93db358be94cac10452936.tar.gz |
bitbake: toaster: use OneToOneField instead of ForeignKey
Used OneToOneField to reference BuildRequest in BRBitbake model.
Fixed django warning:
WARNINGS: Setting unique=True on a ForeignKey has the same effect
as using a OneToOneField.
(Bitbake rev: aaa4319ebbb06facb77b4ba936cf3aa2068ff238)
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/lib/toaster/bldcontrol/localhostbecontroller.py')
-rw-r--r-- | bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py index 00228e9ef0..4f6f15c601 100644 --- a/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py +++ b/bitbake/lib/toaster/bldcontrol/localhostbecontroller.py | |||
@@ -115,18 +115,17 @@ class LocalhostBEController(BuildEnvironmentController): | |||
115 | return local_checkout_path | 115 | return local_checkout_path |
116 | 116 | ||
117 | 117 | ||
118 | def setLayers(self, bitbakes, layers, targets): | 118 | def setLayers(self, bitbake, layers, targets): |
119 | """ a word of attention: by convention, the first layer for any build will be poky! """ | 119 | """ a word of attention: by convention, the first layer for any build will be poky! """ |
120 | 120 | ||
121 | assert self.be.sourcedir is not None | 121 | assert self.be.sourcedir is not None |
122 | assert len(bitbakes) == 1 | ||
123 | # set layers in the layersource | 122 | # set layers in the layersource |
124 | 123 | ||
125 | # 1. get a list of repos with branches, and map dirpaths for each layer | 124 | # 1. get a list of repos with branches, and map dirpaths for each layer |
126 | gitrepos = {} | 125 | gitrepos = {} |
127 | 126 | ||
128 | gitrepos[(bitbakes[0].giturl, bitbakes[0].commit)] = [] | 127 | gitrepos[(bitbake.giturl, bitbake.commit)] = [] |
129 | gitrepos[(bitbakes[0].giturl, bitbakes[0].commit)].append( ("bitbake", bitbakes[0].dirpath) ) | 128 | gitrepos[(bitbake.giturl, bitbake.commit)].append( ("bitbake", bitbake.dirpath) ) |
130 | 129 | ||
131 | for layer in layers: | 130 | for layer in layers: |
132 | # we don't process local URLs | 131 | # we don't process local URLs |
@@ -198,7 +197,7 @@ class LocalhostBEController(BuildEnvironmentController): | |||
198 | # make sure we have a working bitbake | 197 | # make sure we have a working bitbake |
199 | if not os.path.exists(os.path.join(self.pokydirname, 'bitbake')): | 198 | if not os.path.exists(os.path.join(self.pokydirname, 'bitbake')): |
200 | logger.debug("localhostbecontroller: checking bitbake into the poky dirname %s " % self.pokydirname) | 199 | logger.debug("localhostbecontroller: checking bitbake into the poky dirname %s " % self.pokydirname) |
201 | self._shellcmd("git clone -b \"%s\" \"%s\" \"%s\" " % (bitbakes[0].commit, bitbakes[0].giturl, os.path.join(self.pokydirname, 'bitbake'))) | 200 | self._shellcmd("git clone -b \"%s\" \"%s\" \"%s\" " % (bitbake.commit, bitbake.giturl, os.path.join(self.pokydirname, 'bitbake'))) |
202 | 201 | ||
203 | # verify our repositories | 202 | # verify our repositories |
204 | for name, dirpath in gitrepos[(giturl, commit)]: | 203 | for name, dirpath in gitrepos[(giturl, commit)]: |
@@ -224,7 +223,7 @@ class LocalhostBEController(BuildEnvironmentController): | |||
224 | for target in targets: | 223 | for target in targets: |
225 | try: | 224 | try: |
226 | customrecipe = CustomImageRecipe.objects.get(name=target.target, | 225 | customrecipe = CustomImageRecipe.objects.get(name=target.target, |
227 | project=bitbakes[0].req.project) | 226 | project=bitbake.req.project) |
228 | except CustomImageRecipe.DoesNotExist: | 227 | except CustomImageRecipe.DoesNotExist: |
229 | continue # not a custom recipe, skip | 228 | continue # not a custom recipe, skip |
230 | 229 | ||
@@ -278,7 +277,7 @@ class LocalhostBEController(BuildEnvironmentController): | |||
278 | 277 | ||
279 | 278 | ||
280 | def triggerBuild(self, bitbake, layers, variables, targets): | 279 | def triggerBuild(self, bitbake, layers, variables, targets): |
281 | # set up the buid environment with the needed layers | 280 | # set up the build environment with the needed layers |
282 | self.setLayers(bitbake, layers, targets) | 281 | self.setLayers(bitbake, layers, targets) |
283 | 282 | ||
284 | # get the bb server running with the build req id and build env id | 283 | # get the bb server running with the build req id and build env id |