diff options
author | Richard Purdie <richard@openedhand.com> | 2007-01-08 23:53:01 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2007-01-08 23:53:01 +0000 |
commit | f5665d5bfcfb13d01da9e4c7d5046453e80f7baf (patch) | |
tree | b8908549afaf3006bf3763419711090ac999c2a4 /bitbake/lib/bb/shell.py | |
parent | aec95de5f7dca2afa3a4a0bdb0d4d553c13f680d (diff) | |
download | poky-f5665d5bfcfb13d01da9e4c7d5046453e80f7baf.tar.gz |
bitbake: Sync with upstream.
* File licence headers were sanitised causing most of the diff.
* cooker.py was created from bin/bitbake.
* cvs fetcher port option was added
* The -f force option was fixed to work correctly
* Multiple entries in rrecrdeps are now handled correctly
(allows adding do_deploy to image depends)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1129 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'bitbake/lib/bb/shell.py')
-rw-r--r-- | bitbake/lib/bb/shell.py | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/bitbake/lib/bb/shell.py b/bitbake/lib/bb/shell.py index cb8e97b715..32a773064b 100644 --- a/bitbake/lib/bb/shell.py +++ b/bitbake/lib/bb/shell.py | |||
@@ -1,4 +1,3 @@ | |||
1 | #!/usr/bin/env python | ||
2 | # ex:ts=4:sw=4:sts=4:et | 1 | # ex:ts=4:sw=4:sts=4:et |
3 | # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- | 2 | # -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- |
4 | ########################################################################## | 3 | ########################################################################## |
@@ -6,17 +5,18 @@ | |||
6 | # Copyright (C) 2005-2006 Michael 'Mickey' Lauer <mickey@Vanille.de> | 5 | # Copyright (C) 2005-2006 Michael 'Mickey' Lauer <mickey@Vanille.de> |
7 | # Copyright (C) 2005-2006 Vanille Media | 6 | # Copyright (C) 2005-2006 Vanille Media |
8 | # | 7 | # |
9 | # This program is free software; you can redistribute it and/or modify it under | 8 | # This program is free software; you can redistribute it and/or modify |
10 | # the terms of the GNU General Public License as published by the Free Software | 9 | # it under the terms of the GNU General Public License version 2 as |
11 | # Foundation; version 2 of the License. | 10 | # published by the Free Software Foundation. |
12 | # | 11 | # |
13 | # This program is distributed in the hope that it will be useful, but WITHOUT | 12 | # This program is distributed in the hope that it will be useful, |
14 | # ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS | 13 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | # FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. | 14 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | # GNU General Public License for more details. | ||
16 | # | 16 | # |
17 | # You should have received a copy of the GNU General Public License along with | 17 | # You should have received a copy of the GNU General Public License along |
18 | # this program; if not, write to the Free Software Foundation, Inc., 59 Temple | 18 | # with this program; if not, write to the Free Software Foundation, Inc., |
19 | # Place, Suite 330, Boston, MA 02111-1307 USA. | 19 | # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. |
20 | # | 20 | # |
21 | ########################################################################## | 21 | ########################################################################## |
22 | # | 22 | # |
@@ -171,7 +171,7 @@ class BitBakeShellCommands: | |||
171 | td.add_unresolved(cooker.configuration.data, cooker.status) | 171 | td.add_unresolved(cooker.configuration.data, cooker.status) |
172 | 172 | ||
173 | rq = runqueue.RunQueue() | 173 | rq = runqueue.RunQueue() |
174 | rq.prepare_runqueue(cooker.configuration.data, cooker.status, td, tasks) | 174 | rq.prepare_runqueue(cooker, cooker.configuration.data, cooker.status, td, tasks) |
175 | rq.execute_runqueue(cooker, cooker.configuration.data, cooker.status, td, tasks) | 175 | rq.execute_runqueue(cooker, cooker.configuration.data, cooker.status, td, tasks) |
176 | 176 | ||
177 | except Providers.NoProvider: | 177 | except Providers.NoProvider: |
@@ -255,6 +255,11 @@ class BitBakeShellCommands: | |||
255 | except parse.ParseError: | 255 | except parse.ParseError: |
256 | print "ERROR: Unable to open or parse '%s'" % bf | 256 | print "ERROR: Unable to open or parse '%s'" % bf |
257 | else: | 257 | else: |
258 | # Remove stamp for target if force mode active | ||
259 | if cooker.configuration.force: | ||
260 | bb.msg.note(2, bb.msg.domain.RunQueue, "Remove stamp %s, %s" % (cmd, bf)) | ||
261 | bb.build.del_stamp('do_%s' % cmd, bbfile_data) | ||
262 | |||
258 | item = data.getVar('PN', bbfile_data, 1) | 263 | item = data.getVar('PN', bbfile_data, 1) |
259 | data.setVar( "_task_cache", [], bbfile_data ) # force | 264 | data.setVar( "_task_cache", [], bbfile_data ) # force |
260 | try: | 265 | try: |