diff options
Diffstat (limited to 'bitbake-dev')
| -rw-r--r-- | bitbake-dev/lib/bb/cooker.py | 4 | ||||
| -rw-r--r-- | bitbake-dev/lib/bb/runqueue.py | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py index 01537ab2f7..5e3cccbdb6 100644 --- a/bitbake-dev/lib/bb/cooker.py +++ b/bitbake-dev/lib/bb/cooker.py | |||
| @@ -195,7 +195,7 @@ class BBCooker: | |||
| 195 | bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event)) | 195 | bb.msg.error(bb.msg.domain.Build, "%s event exception, aborting" % bb.event.getName(event)) |
| 196 | raise | 196 | raise |
| 197 | 197 | ||
| 198 | def tryBuild(self, fn): | 198 | def tryBuild(self, fn, task): |
| 199 | """ | 199 | """ |
| 200 | Build a provider and its dependencies. | 200 | Build a provider and its dependencies. |
| 201 | build_depends is a list of previous build dependencies (not runtime) | 201 | build_depends is a list of previous build dependencies (not runtime) |
| @@ -209,7 +209,7 @@ class BBCooker: | |||
| 209 | #if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data): | 209 | #if bb.build.stamp_is_current('do_%s' % self.configuration.cmd, the_data): |
| 210 | # return True | 210 | # return True |
| 211 | 211 | ||
| 212 | return self.tryBuildPackage(fn, item, self.configuration.cmd, the_data) | 212 | return self.tryBuildPackage(fn, item, task, the_data) |
| 213 | 213 | ||
| 214 | def showVersions(self): | 214 | def showVersions(self): |
| 215 | 215 | ||
diff --git a/bitbake-dev/lib/bb/runqueue.py b/bitbake-dev/lib/bb/runqueue.py index 1667205829..1c911ef0c8 100644 --- a/bitbake-dev/lib/bb/runqueue.py +++ b/bitbake-dev/lib/bb/runqueue.py | |||
| @@ -993,10 +993,9 @@ class RunQueue: | |||
| 993 | os.setpgid(0, 0) | 993 | os.setpgid(0, 0) |
| 994 | newsi = os.open('/dev/null', os.O_RDWR) | 994 | newsi = os.open('/dev/null', os.O_RDWR) |
| 995 | os.dup2(newsi, sys.stdin.fileno()) | 995 | os.dup2(newsi, sys.stdin.fileno()) |
| 996 | self.cooker.configuration.cmd = taskname[3:] | ||
| 997 | bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data) | 996 | bb.data.setVar("__RUNQUEUE_DO_NOT_USE_EXTERNALLY", self, self.cooker.configuration.data) |
| 998 | try: | 997 | try: |
| 999 | self.cooker.tryBuild(fn) | 998 | self.cooker.tryBuild(fn, taskname[3:]) |
| 1000 | except bb.build.EventException: | 999 | except bb.build.EventException: |
| 1001 | bb.msg.error(bb.msg.domain.Build, "Build of " + fn + " " + taskname + " failed") | 1000 | bb.msg.error(bb.msg.domain.Build, "Build of " + fn + " " + taskname + " failed") |
| 1002 | sys.exit(1) | 1001 | sys.exit(1) |
