bitbake.git
8 years agobitbake/data_smart: Improve Variable expansion error handling
Richard Purdie [Wed, 23 Feb 2011 13:13:31 +0000 (13:13 +0000)]
bitbake/data_smart: Improve Variable expansion error handling

If expanding a variable triggers an exception the caller currently has no
way to supress the error message or otherwise handle the siutation. An
example of where this is a problem is "bitbake -e" showing tracebacks and
errors for variables like SRCPV in OE/Poky.

Secondly in a chained expansion fails, log mesages are recorded for
every step of the expansion, not just the innermost error which is
where the real failure occured.

To fix this we introduce a new exception ExpansionError which callers
can handle as appropriate.

(From Poky rev: 101b599110f7bc29f52a14a968f30323aeb797ca)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8 years agobitbake/data_smart: Improve the way lazyassignment works
Richard Purdie [Wed, 23 Feb 2011 11:48:01 +0000 (11:48 +0000)]
bitbake/data_smart: Improve the way lazyassignment works

Currently, if a variable has been set with ??= and the code looks it up
before the data finalisation phase, no value is found. This is causes
serious problems for anonymous python functions which manipulate data, or
for the fetcher revision handling code where revisions can be set with
??=.

There is also a significant performance implication for processing lazy
assignment in finalise.

Moving the check for a default value into getVarFlag addresses both
the timing issue and the performace. This change gives a 7% real time
performance improvement to parsing the Poky metadata. The cost of the
check at this point is minimal since we have all the data flags available.

This should also fix Yocto bug 752.

(From Poky rev: 6ea24f04cd635295d826f03d9c7d8a08cc1d5b31)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8 years agobitbake/fetch2: Ensure SRCREV_pn-PN is checked for a revision when the SRC_URI is...
Richard Purdie [Wed, 23 Feb 2011 11:47:50 +0000 (11:47 +0000)]
bitbake/fetch2: Ensure SRCREV_pn-PN is checked for a revision when the SRC_URI is unnamed

(From Poky rev: 707132c60a84cdcf50da056c68f2da7402d3b2e8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
8 years agobitbake/cooker: Fix parsing failure zombie problem
Richard Purdie [Wed, 23 Feb 2011 11:09:07 +0000 (11:09 +0000)]
bitbake/cooker: Fix parsing failure zombie problem

When parsing if a SystemExit event is triggered, it causes the parsing thread to
exit and the main process hangs waiting for it to finish indefintely. Add code to
catch BaseExceptions and raise these with the main process gracefully instead
of just hanging indefinitely with zombie processes.

(From Poky rev: 56a92105fe6b779c69bccd44c2cff8f21cafdfbd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fecth2: Ensure BB_FETCH_PREMIRRORONLY being set as false is handled correctly
Richard Purdie [Wed, 16 Feb 2011 12:35:35 +0000 (12:35 +0000)]
bitbake/fecth2: Ensure BB_FETCH_PREMIRRORONLY being set as false is handled correctly

(From Poky rev: 3ef2d39dbf8a573acfbf633c1d5d7cb3cee18788)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Revert part of the unpack change until the issues with it are resolved
Richard Purdie [Sun, 13 Feb 2011 00:05:06 +0000 (00:05 +0000)]
bitbake/fetch2: Revert part of the unpack change until the issues with it are resolved

(From Poky rev: b9a97e07b48b20b00feff5b8c7196c3a3b7762b6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofetch2: unpack revision
Mark Hatle [Fri, 11 Feb 2011 17:43:54 +0000 (11:43 -0600)]
fetch2: unpack revision

Revise the unpack function to have a way to disable the unpack.  This is
based on the work from "Andreas Oberritter <obi@opendreambox.org>", see
http://cgit.openembedded.net/cgit.cgi/openembedded/commit/?id=2bdfe8519eda8067845019a699acdf19a21ba380

In addition, the to_boolean function comes from the work of
"Chris Larson <chris_larson@mentor.com>", see
http://cgit.openembedded.net/cgit.cgi/openembedded/commit/?id=900cc29b603691eb3a077cb660545ead3715ed54

(From Poky rev: 3faa635fd408695dd5b754fda3f6060dd670b81d)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Add explict network access exception and handling to give users usabl...
Richard Purdie [Fri, 11 Feb 2011 22:08:21 +0000 (22:08 +0000)]
bitbake/fetch2: Add explict network access exception and handling to give users usable error messages

(From Poky rev: 029f19bd3d4dc09fb48bf6e5322d48bb84c4eb34)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Fix patch merge error
Richard Purdie [Fri, 11 Feb 2011 16:24:26 +0000 (16:24 +0000)]
bitbake/fetch2: Fix patch merge error

(From Poky rev: 132ec8d3b7e5916c64de85b248632021f51701d3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Add some debug output so its clear when PREMIRRORS, upstream and...
Richard Purdie [Fri, 11 Feb 2011 16:16:51 +0000 (16:16 +0000)]
bitbake/fetch2: Add some debug output so its clear when PREMIRRORS, upstream and MIRRORS are being used

(From Poky rev: a72d49478e57b05b99cb1b3beec62a9e79a24e7a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ensure network access status is reset for each loop iteration in...
Richard Purdie [Fri, 11 Feb 2011 16:15:36 +0000 (16:15 +0000)]
bitbake/fetch2: Ensure network access status is reset for each loop iteration in download()

(From Poky rev: 20afb21a375b6a5f0d4ff6e269eeee121d6f087a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/wget: Fix missing string parameter reference
Richard Purdie [Fri, 11 Feb 2011 12:16:44 +0000 (12:16 +0000)]
bitbake/fetch2/wget: Fix missing string parameter reference

(From Poky rev: 05d8b6422dc3154b2890f8db3f919faec4457d6f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ensure failed fetch attempts are logged in the debug logs
Richard Purdie [Fri, 11 Feb 2011 12:14:20 +0000 (12:14 +0000)]
bitbake/fetch2: Ensure failed fetch attempts are logged in the debug logs

(From Poky rev: ea70c4362fdb81bc9467975c145c48196c45e3af)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Correctly handle git mirror tarball fetching
Richard Purdie [Fri, 11 Feb 2011 12:06:44 +0000 (12:06 +0000)]
bitbake/fetch2: Correctly handle git mirror tarball fetching

(From Poky rev: 7f30131faaa5e3fdb1191c9da95c5683cefafeb5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Pass over malformatted (empty) mirror url lines
Richard Purdie [Fri, 11 Feb 2011 12:04:59 +0000 (12:04 +0000)]
bitbake/fetch2: Pass over malformatted (empty) mirror url lines

(From Poky rev: 20ab1cb0ca10b0c7724f2154fe5b54c939b8a887)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Fix message about md5 checksums when sha256 is incorrect
Richard Purdie [Fri, 11 Feb 2011 21:59:23 +0000 (21:59 +0000)]
bitbake/fetch2: Fix message about md5 checksums when sha256 is incorrect

(From Poky rev: 4a226460d5e158e8adbf74a68717cb9a923e8009)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agoprocess.py: Avoid deprecation warning
Richard Purdie [Mon, 14 Feb 2011 16:32:07 +0000 (16:32 +0000)]
process.py: Avoid deprecation warning

bitbake/lib/bb/process.py:15: DeprecationWarning: BaseException.message has been deprecated as of Python 2.6

(From Poky rev: 6cb8fd6def4912e4aa76330649ba42a9ed2694fd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/build.py: When looking up extra stamp info for setscene tasks, use the real...
Richard Purdie [Thu, 27 Jan 2011 11:20:50 +0000 (11:20 +0000)]
bitbake/build.py: When looking up extra stamp info for setscene tasks, use the real taskname

(Fixed based on a bug reported by Dongxiao Xu <dongxiao.xu@intel.com>)

(From Poky rev: c34913ea5a4f20ce4bca3c68a65e9f64f1e3910c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/unlockfile: Fix exception handling
Richard Purdie [Wed, 26 Jan 2011 12:20:14 +0000 (12:20 +0000)]
bitbake/unlockfile: Fix exception handling

(From Poky rev: 5f866ac84f72699139be1d98f010017c7b71f0f7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/utils: Ignore OSError in unlockfile
Richard Purdie [Mon, 24 Jan 2011 14:26:50 +0000 (14:26 +0000)]
bitbake/utils: Ignore OSError in unlockfile

(From Poky rev: 74783fec56d6ced1a793b36410233472e7daf445)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agosiggen.py: better print for task hash comparison
Kevin Tian [Thu, 20 Jan 2011 05:54:51 +0000 (13:54 +0800)]
siggen.py: better print for task hash comparison

current bitbake-diffsigs simply print out the whole 'runtaskdeps' when there's mismatch, which
is not very readable. On the other hand, 'runtaskhashes' comparison is broken which assumes
same key existing in two sides. This commit provides better output by figuring out differences
from addition, removal or hash change.

(From Poky rev: bcb18738361ee2394bc266911e9e75d5bf1c10cd)

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofix parameter order for flaglist()
Dongxiao Xu [Thu, 20 Jan 2011 13:02:11 +0000 (21:02 +0800)]
fix parameter order for flaglist()

(From Poky rev: 5da9423217a5cd204d17a0f7bbe248082a1b257c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/providers.py: Fix runtime providers problems
Richard Purdie [Thu, 20 Jan 2011 22:44:33 +0000 (22:44 +0000)]
bitbake/providers.py: Fix runtime providers problems

Take a real world testcase where you have two recipes, each of which
contains PACKAGES_DYNAMIC = "gdk-pixbuf-loaders-*" and recipes which
RDEPEND on some gdk-pixbuf-loaders-xxx package. To select between these
you need to set a PREFERRED_PROVIDER.

These are specified in the PN namespace so the locgical conclusion is
that setting PREFERRED_PROVIDER_gdk-pixbuf = "gtk+" should work. It
doesn't and instead checks crazy things.

The code was correctly finding the two possible providers, gtk+ and
gdk-pixbuf. It was however only accepting PREFERRED_PROVIDER_gtk+
= "gdk-pixbuf" to resolve this problem which reads as the exact
opposite to what was wanted.

This patch changes the code to do something that makes sense. I suspect
that before these changes it was pretty much a null operation rubber
stamping the single provider case. For Poky at least it exposes a few
cases where -nativesdk recipes were providing the same things as their
normal counterparts but these are genuine bugs in the metadata.

I've also attempted to make the multiple provider error message human
readable as I counldn't understand it and I doubt anyone else could
either.

(From Poky rev: d4f537965b3a530ca7ed3bce206abbff810031e8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/utils.py: Teach unlockfile about shared mode lockfiles
Richard Purdie [Wed, 19 Jan 2011 13:30:14 +0000 (13:30 +0000)]
bitbake/utils.py: Teach unlockfile about shared mode lockfiles

(From Poky rev: fd88588df029604689db9b0e30c55aad68392a5d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/utils.py: Add option of holding shared lockfiles
Richard Purdie [Wed, 19 Jan 2011 11:01:54 +0000 (11:01 +0000)]
bitbake/utils.py: Add option of holding shared lockfiles

(From Poky rev: 7857834691868b7f48f732ee78d8770f5473ff68)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agoIntroduce stamp-extra-info task flag into stamp filenames
Dongxiao Xu [Tue, 18 Jan 2011 08:18:18 +0000 (16:18 +0800)]
Introduce stamp-extra-info task flag into stamp filenames

For certain tasks, we need additional information in build stamp file
other than the task name and file name. stamp-extra-info is introduced as
a task flag which is appended to the stamp file name.

[Code simplifcations/tweaks from Richard]

(From Poky rev: 80cf3e405c923ed95dd09936739e816dbdd92299)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/build.py: Rename message field to avoid DeprecationWarning: BaseException...
Richard Purdie [Mon, 17 Jan 2011 15:52:06 +0000 (15:52 +0000)]
bitbake/build.py: Rename message field to avoid DeprecationWarning: BaseException.message warning

(From Poky rev: 0388f0758f84c7a8ec975d9be7e384cb65d9af4c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/siggen.py: Fix whitelisted variable handling
Richard Purdie [Wed, 12 Jan 2011 15:58:48 +0000 (15:58 +0000)]
bitbake/siggen.py: Fix whitelisted variable handling

Even when a variable was whitelisted, any dependencies of that variable
could still creep into the task hash due to the way the whitelisting
code worked. This patch changes thing to ensure that when whitelisted,
that whitelisting applies to the variable and any dependencies it has.

(From Poky rev: 25b3d39612c0bea1d136e346d938abde56aa699f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agoIncrement version for development version
Richard Purdie [Fri, 18 Feb 2011 17:06:45 +0000 (17:06 +0000)]
Increment version for development version

9 years agoRelease 1.12.0 1.12.0
Richard Purdie [Fri, 18 Feb 2011 17:03:42 +0000 (17:03 +0000)]
Release 1.12.0

9 years agouihelper: import bb.build, kill commented lines
Chris Larson [Wed, 16 Feb 2011 22:58:07 +0000 (15:58 -0700)]
uihelper: import bb.build, kill commented lines

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agocooker: don't choke if we have nothing to parse
Chris Larson [Wed, 16 Feb 2011 22:50:50 +0000 (17:50 -0500)]
cooker: don't choke if we have nothing to parse

If all our recipes were cached, there's no reason to fire off any parsing
progress events at all.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agosiggen: add bb.data, bb.parse imports
Chris Larson [Wed, 16 Feb 2011 22:41:37 +0000 (15:41 -0700)]
siggen: add bb.data, bb.parse imports

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agorunqueue: simplify RunQueueStats.copy
Chris Larson [Wed, 16 Feb 2011 22:24:24 +0000 (15:24 -0700)]
runqueue: simplify RunQueueStats.copy

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agorunqueue: pass a copy of the RunQueueStats to events
Chris Larson [Wed, 16 Feb 2011 22:18:06 +0000 (15:18 -0700)]
runqueue: pass a copy of the RunQueueStats to events

This avoids cases where the stats are modified after the event is fired but
before it's dispatched to the UI.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agoserver: clean up call of write_profile_stats
Chris Larson [Wed, 16 Feb 2011 00:07:00 +0000 (17:07 -0700)]
server: clean up call of write_profile_stats

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agoserver: add profiling support to ProcessServer
Chris Larson [Tue, 15 Feb 2011 23:59:56 +0000 (16:59 -0700)]
server: add profiling support to ProcessServer

Based on poky's support, particularly the format of the processed log file and
the log message shown to the user regarding the files written.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agoEnable some DeprecationWarnings
Chris Larson [Sat, 12 Feb 2011 04:26:51 +0000 (21:26 -0700)]
Enable some DeprecationWarnings

We'll be skipping the Pending Deprecation step given our release process.

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agopersist_data: handle lock in sqlite and use the shared cache
Chris Larson [Thu, 10 Feb 2011 00:56:42 +0000 (17:56 -0700)]
persist_data: handle lock in sqlite and use the shared cache

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agopersist_data: drop SQLData indirection
Chris Larson [Fri, 11 Feb 2011 16:42:38 +0000 (09:42 -0700)]
persist_data: drop SQLData indirection

The common case (if not the only case) is to only use a single domain.  The
only reason SQLData exists is to make it easier to delete a domain.  Yet,
there's no need for us to delete a domain if SQLTable knows how to clear
itself out.  So, add clear() to the table and pass the domain to persist().

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agopersist_data: use better items/values methods for SQLTable
Chris Larson [Thu, 10 Feb 2011 00:57:35 +0000 (17:57 -0700)]
persist_data: use better items/values methods for SQLTable

Signed-off-by: Chris Larson <chris_larson@mentor.com>
9 years agofetch2: Correct the clean() mechanism for the fetcher2 code
Saul Wold [Wed, 9 Feb 2011 22:30:29 +0000 (14:30 -0800)]
fetch2: Correct the clean() mechanism for the fetcher2 code

This create a clean() method in each of the fetcher modules
and correctly cleans the .done stamp file and lock files

(From Poky rev: 14dea89521c0c648e8e543388096a6dcd6d4f2e0)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Write mirror tarballs if enabled and they don't exist, also set...
Richard Purdie [Thu, 10 Feb 2011 15:14:49 +0000 (15:14 +0000)]
bitbake/fetch2/git: Write mirror tarballs if enabled and they don't exist, also set a default value for mirror tarball generation

(From Poky rev: 59a08262aba2d2b9b8b299a2818fb4cfe13b9909)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Fix negated if check for BB_FETCH_PREMIRRORONLY
Richard Purdie [Wed, 9 Feb 2011 01:23:56 +0000 (01:23 +0000)]
bitbake/fetch2: Fix negated if check for BB_FETCH_PREMIRRORONLY

(From Poky rev: 29ed2c6e9a0c3cc57c5bbaf3c53e1cff8586c51c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofetch2: Add SRPM knowledge
Mark Hatle [Tue, 8 Feb 2011 00:18:18 +0000 (18:18 -0600)]
fetch2: Add SRPM knowledge

Enable the fetcher to be able to unpack and SRPM.  By default the system will
unpack the contents of the SRPM into the WORKDIR.

A new syntax "unpack=file" was developed for the SRC_URI, to allow for a
recipe to extract a specific file within an SRPM.  An unpack operation will
then be executed on the extracted file.

In order to apply extracted patches (or unpack files not specified with
unpack), you must specify the path using WORKDIR, i.e.:

file://${WORKDIR}/mypatch.patch

(From Poky rev: 906285ff00d6ffd3fd7713af52250e7c6503edb7)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ignore UnboundLocalError in exception handler in try_mirror
Richard Purdie [Tue, 8 Feb 2011 17:30:45 +0000 (17:30 +0000)]
bitbake/fetch2: Ignore UnboundLocalError in exception handler in try_mirror

(From Poky rev: aa45760702e874977454778659c205b29d1ff049)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Move symlink handling into try_mirror where is belongs instead of...
Richard Purdie [Tue, 8 Feb 2011 12:46:25 +0000 (12:46 +0000)]
bitbake/fetch2: Move symlink handling into try_mirror where is belongs instead of the main download function

(From Poky rev: ee1a9c0476cc4b2ce9dfb0faa29a1371a8517c40)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: When using BB_FETCH_PREMIRRORONLY, set BB_NO_NETWORK after premirrors...
Richard Purdie [Tue, 8 Feb 2011 12:44:06 +0000 (12:44 +0000)]
bitbake/fetch2: When using BB_FETCH_PREMIRRORONLY, set BB_NO_NETWORK after premirrors as there could be data processing needed by the real fetcher

(From Poky rev: c4e66a7fe0c314b843aac6340995c584ec156529)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ensure we only remove files, not directories when fetch failures...
Richard Purdie [Tue, 8 Feb 2011 12:42:24 +0000 (12:42 +0000)]
bitbake/fetch2: Ensure we only remove files, not directories when fetch failures occur

(From Poky rev: 91eeb9b0d334275ff2730e55e86fd351e1b652ef)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ensure original ud is preserved in try_mirror
Richard Purdie [Tue, 8 Feb 2011 12:40:40 +0000 (12:40 +0000)]
bitbake/fetch2: Ensure original ud is preserved in try_mirror

(From Poky rev: 0713fb6b99486cd08c6036dba7aeb15e3bfb8129)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Fix broken variable reference
Richard Purdie [Tue, 8 Feb 2011 09:33:52 +0000 (09:33 +0000)]
bitbake/fetch2/git: Fix broken variable reference

(From Poky rev: a235c67479846590eb2c7236bec3360b23c3e9b6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Ensure unresolved branches are translated into revisions
Richard Purdie [Tue, 8 Feb 2011 09:27:59 +0000 (09:27 +0000)]
bitbake/fetch2/git: Ensure unresolved branches are translated into revisions

(From Poky rev: 5920e85c561624e657c126df58f5c378a8950bbc)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofetch2: add try/finally to ensure lockfile is unlocked on failure
Saul Wold [Tue, 8 Feb 2011 01:29:46 +0000 (17:29 -0800)]
fetch2: add try/finally to ensure lockfile is unlocked on failure

(From Poky rev: 1544aa8ab4a80d529a001e27b473645f2caec87c)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofetch2: add runfetchcmd to import for fetchers
Saul Wold [Mon, 7 Feb 2011 23:42:45 +0000 (15:42 -0800)]
fetch2: add runfetchcmd to import for fetchers

(From Poky rev: 232b6f3c92928c333ad1201aa8eb3706e7251cdf)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2:Fetch Make using the fn based cache optional
Richard Purdie [Mon, 7 Feb 2011 21:12:51 +0000 (21:12 +0000)]
bitbake/fetch2:Fetch Make using the fn based cache optional

(From Poky rev: 500c66337c7cb5e3044a02ef761097713e47f523)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Fix pickling issues with fetcher exceptions
Richard Purdie [Mon, 7 Feb 2011 20:46:42 +0000 (20:46 +0000)]
bitbake/fetch2: Fix pickling issues with fetcher exceptions

See the problems in http://bugs.python.org/issue1692335, need to set self.args
correctly.

(From Poky rev: d4b4b48addfa781d7b94965e0477974c3fb6dbb3)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Update mirror processing to ensure we look for mirror tarballs
Richard Purdie [Mon, 7 Feb 2011 15:28:05 +0000 (15:28 +0000)]
bitbake/fetch2: Update mirror processing to ensure we look for mirror tarballs

(From Poky rev: 94faffdaf6c13ce59987aab28383d66a9a0bf100)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Update forcefetch and mirror handling to clean up, simplfy and bug...
Richard Purdie [Mon, 7 Feb 2011 12:08:32 +0000 (12:08 +0000)]
bitbake/fetch2: Update forcefetch and mirror handling to clean up, simplfy and bug fix the code

(From Poky rev: 37624b97450f2ba3d6fad3e1e51818486451447e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Match Fetcher log domain to that in bb.msg
Richard Purdie [Mon, 7 Feb 2011 14:46:53 +0000 (14:46 +0000)]
bitbake/fetch2: Match Fetcher log domain to that in bb.msg

(From Poky rev: ded83ffc3bd86553c9b540795660985905c925ba)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: use clonedir as ud.localfile too since the mirror tarball may...
Richard Purdie [Mon, 7 Feb 2011 10:13:29 +0000 (10:13 +0000)]
bitbake/fetch2/git: use clonedir as ud.localfile too since the mirror tarball may not exist

(From Poky rev: 681bcf4e6b606dde2029d143805023a927285917)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git.py: Ensure that forcefetch operates in the correct directory for...
Richard Purdie [Mon, 7 Feb 2011 09:34:24 +0000 (09:34 +0000)]
bitbake/fetch2/git.py: Ensure that forcefetch operates in the correct directory for calling _contains_ref()

(From Poky rev: 330886826770ff6ec1449dc375cb4c3604b2736b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Fix localpath to point at the clone repo since we no longer alway...
Richard Purdie [Mon, 7 Feb 2011 09:13:44 +0000 (09:13 +0000)]
bitbake/fetch2/git: Fix localpath to point at the clone repo since we no longer always generate a mirror tarball and it isn't a good guide to fetcher success

(From Poky rev: 917d3e9697acefe308e7139e86df37a072ee3500)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Use True instead of integer values
Richard Purdie [Fri, 4 Feb 2011 14:40:41 +0000 (14:40 +0000)]
bitbake/fetch2: Use True instead of integer values

(From Poky rev: 7202a77134029cb37540c785ce0161a4dd574853)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Drop name/override ordering backwards compatibility code
Richard Purdie [Fri, 4 Feb 2011 14:37:09 +0000 (14:37 +0000)]
bitbake/fetch2: Drop name/override ordering backwards compatibility code

(From Poky rev: 8f2abf4a9f000d42e98c4936e393bd5033a1af48)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/svn: The concept of using dates with svn is totally insane, drop support
Richard Purdie [Fri, 4 Feb 2011 13:46:31 +0000 (13:46 +0000)]
bitbake/fetch2/svn: The concept of using dates with svn is totally insane, drop support

(From Poky rev: ee6f34483a9bfeca5b5c3656fd62bb4849d5fbb8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Define a new interface to the fetcher code though the 'Fetch' class
Richard Purdie [Fri, 4 Feb 2011 13:14:03 +0000 (13:14 +0000)]
bitbake/fetch2: Define a new interface to the fetcher code though the 'Fetch' class

(From Poky rev: ca7adf75295c2a6041b891bfa61e0b4bc2f7c860)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Fix typo
Richard Purdie [Fri, 4 Feb 2011 11:06:16 +0000 (11:06 +0000)]
bitbake/fetch2: Fix typo

(From Poky rev: 08a9fef4fa0036708f29bd150d7ecf66354e5475)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Drop legacy CVSDATE support
Richard Purdie [Fri, 4 Feb 2011 11:03:34 +0000 (11:03 +0000)]
bitbake/fetch2: Drop legacy CVSDATE support

(From Poky rev: 806d1c25f8ca8ab5116652e6f82f7d9ee5774278)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Move getSRCDate to FetchData class where is more appropriate
Richard Purdie [Fri, 4 Feb 2011 11:02:15 +0000 (11:02 +0000)]
bitbake/fetch2: Move getSRCDate to FetchData class where is more appropriate

(From Poky rev: f60d9d6bd4bb7691b62bf1f4b1fbeaa1faa53879)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Make srcrev_internal_helper a normal function, doesn't belong in...
Richard Purdie [Fri, 4 Feb 2011 10:59:42 +0000 (10:59 +0000)]
bitbake/fetch2: Make srcrev_internal_helper a normal function, doesn't belong in the FetchMethod class

(From Poky rev: 831c6c1d3c23c50f9c55a6bbf8dc6311bca3881b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Rename Fetch class to FetchMethod
Richard Purdie [Fri, 4 Feb 2011 10:49:27 +0000 (10:49 +0000)]
bitbake/fetch2: Rename Fetch class to FetchMethod

(From Poky rev: ab0dd1397491478ee6149283e5ba8775dd8cdc3b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Drop old md5 handling code
Richard Purdie [Fri, 4 Feb 2011 10:30:54 +0000 (10:30 +0000)]
bitbake/fetch2: Drop old md5 handling code

Drop some old md5 functions since we have improved functionality now which includes
sha256 checksum support. This stops each download being md5 checksumed twice.

Also change ".md5" stamp extentions to ".done" to better describe its use as a
download complete marker file and no longer write the md5 sum to the files.

(From Poky rev: 74b71864fed79ce60e721945c8e239b3ebf49200)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Rewrite and improve exception handling, reusing core functions for...
Richard Purdie [Fri, 4 Feb 2011 10:26:21 +0000 (10:26 +0000)]
bitbake/fetch2: Rewrite and improve exception handling, reusing core functions for common operations where possible

(From Poky rev: d08397ba4d1331993300eacbb2f78fcfef19c1cf)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Have all fetcher exceptions derived from a common BBFetchException...
Richard Purdie [Thu, 3 Feb 2011 23:23:11 +0000 (23:23 +0000)]
bitbake/fetch2: Have all fetcher exceptions derived from a common BBFetchException class

(From Poky rev: f6eefb3ca3bb2a5ea0ec1364bdb0bc41ae58c815)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Drop unused parameter for localpath() and update comments
Richard Purdie [Thu, 3 Feb 2011 22:02:09 +0000 (22:02 +0000)]
bitbake/fetch2: Drop unused parameter for localpath() and update comments

(From Poky rev: 8daab5b95157dda6854fe6bf1929f911fe3cf25e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Simplfy setup_srcrevs
Richard Purdie [Thu, 3 Feb 2011 21:43:01 +0000 (21:43 +0000)]
bitbake/fetch2: Simplfy setup_srcrevs

(From Poky rev: 7e4fbfc1c1887a1a0507b60244aa53b8b1994edd)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Simplify localpath variable handling FetchData init
Richard Purdie [Thu, 3 Feb 2011 21:40:03 +0000 (21:40 +0000)]
bitbake/fetch2: Simplify localpath variable handling FetchData init

(From Poky rev: 49a022d25d35115e7286e2ca2530566da2d71aa8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Define a sane localpath function and remove code duplication
Richard Purdie [Thu, 3 Feb 2011 21:20:39 +0000 (21:20 +0000)]
bitbake/fetch2: Define a sane localpath function and remove code duplication

(From Poky rev: 5a52cb80d6d62c704692ad6cfa93426c4a17bc52)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Move ud.localfile setup into urldata_init
Richard Purdie [Thu, 3 Feb 2011 21:17:26 +0000 (21:17 +0000)]
bitbake/fetch2: Move ud.localfile setup into urldata_init

(From Poky rev: 972eb5fababb33b5537fcfbbaf8e33ea820f0fee)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Drop horrible SRCREV hack which is no longer needed
Richard Purdie [Thu, 3 Feb 2011 20:33:07 +0000 (20:33 +0000)]
bitbake/fetch2: Drop horrible SRCREV hack which is no longer needed

(From Poky rev: 0e5404cedadaea6738ef6468d7eb8a24d23d9bab)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Switch to completely use bare clones
Richard Purdie [Sun, 6 Feb 2011 10:20:18 +0000 (10:20 +0000)]
bitbake/fetch2/git: Switch to completely use bare clones

We no longer need index/workdir support in the mirror tree and it causes all
kind of reference naming problems.Simplifying the code to remove this and use
just bare clones addresses this problem.

We increase the "version" number on the mirror tarballs to reflect the change
and ensure older mirror tarballs are not used as they would break.

(From Poky rev: e4c1e99f234491af1c0fc886e73deedaef108a1a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofetch2/git.py: Fix problem when fetching with no origin
Saul Wold [Sat, 5 Feb 2011 22:11:25 +0000 (14:11 -0800)]
fetch2/git.py: Fix problem when fetching with no origin

When updating a git repo, its possible to not have an origin,
so fail gracefully with a debug message.

(From Poky rev: 192f631129e25b959d501c46c3156b7037b49c22)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Ensure we prune origin to remove stale branches
Richard Purdie [Sat, 5 Feb 2011 13:16:45 +0000 (14:16 +0100)]
bitbake/fetch2/git: Ensure we prune origin to remove stale branches

Thanks to Bruce Ashfield for the tip.

(From Poky rev: 96810cade04cad44d70a7c6e51aacdf89caef92b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Ensure deleted branches upstream are removed, all branch tags...
Richard Purdie [Thu, 3 Feb 2011 20:16:05 +0000 (20:16 +0000)]
bitbake/fetch2/git: Ensure deleted branches upstream are removed, all branch tags are forced to the upstream revisions and all revisions and tags are always fetched

(From Poky rev: dfc5faf717ac1f917af398097d5295128548a55d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Remove old local file acceleration code
Richard Purdie [Thu, 3 Feb 2011 18:24:25 +0000 (18:24 +0000)]
bitbake/fetch2: Remove old local file acceleration code

Since local mirror fetches are always symlinked from the download directory
directly, there is no need for this premirrors hack which doesn't cover
mirrors and also abuses the localpath variable with inconsistent results.

(From Poky rev: 282a828f3dc373d8f1397827ebbe1be1c54f2d2a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ensure that mirror fetches are symlinked from the download directory
Richard Purdie [Thu, 3 Feb 2011 18:22:06 +0000 (18:22 +0000)]
bitbake/fetch2: Ensure that mirror fetches are symlinked from the download directory

When files are fetched from a mirror source that happens to be local,
ensure links are created for the file since subsequent fetch calls
can then follow the links to find files.

Any other approach such as the existing manipulations of localpath
internally to the fetcher are prone to errors, races and other issues.

(From Poky rev: fa9fda05e1d269446b51050195b891346482e8bb)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: When encoding a file:// url, drop user and host information
Richard Purdie [Thu, 3 Feb 2011 18:19:23 +0000 (18:19 +0000)]
bitbake/fetch2: When encoding a file:// url, drop user and host information

When processing a cvs SRC_URI to a file:// mirror, the user and host information
will break the mirror processing. This patch addresses it by only constructing
valid urls.

(From Poky rev: 7f99605562119a13a2510a3c990e3cf577ad764e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/lib/bb/fetch2: Assign a default name in the names array as empty strings...
Richard Purdie [Thu, 3 Feb 2011 00:16:23 +0000 (00:16 +0000)]
bitbake/lib/bb/fetch2: Assign a default name in the names array as empty strings as names cause problems for python

(From Poky rev: a55d86b4051f6d063f9a67db026f7da6f9b50cc6)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Add missing parameter to localcount_internal_helper
Richard Purdie [Wed, 2 Feb 2011 18:48:13 +0000 (18:48 +0000)]
bitbake/fetch2: Add missing parameter to localcount_internal_helper

(From Poky rev: 08cd6c1cb9639e958e0c60a02e317a22cf43f880)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Ensure target directory exists when copying files
Richard Purdie [Wed, 2 Feb 2011 17:46:37 +0000 (17:46 +0000)]
bitbake/fetch2/git: Ensure target directory exists when copying files

(From Poky rev: adfa6c40dadebb18bfd457859300d8c093b007f7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agofetch2: Allow multiple src rev to be used in one src_uri
Yu Ke [Wed, 26 Jan 2011 12:14:06 +0000 (20:14 +0800)]
fetch2: Allow multiple src rev to be used in one src_uri

* SRC_URI format:
the SRC_URI are extended to allow multiple src rev:
name=<name1>,<name2>,...<name-n>
branch=<branch1>,<branch2>,...,<branch-n>
also SRCREV can be defined with
SRCREV_<name1> = xxxxx
SRCREV_<name2> = xxxxx

* FetchData extention
to support multiple src rev, several FetchData data are added:
- FetchData.names: list of name in SRC_URI,  one name per srcrev. name is the index of revision and branch
- FetchData.revisions: dictionary of name->revision.
- FetchData.branches: dictionary of name->branch.

For example, linux-yocto recipes becomes:
SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;branch=${KBRANCH},meta;name=machine,meta"

FetchData.names = ['machine', 'meta']
FetchData.revisions = { 'machine':xxxxx, 'meta':xxxxxx }
FetchData.branches = { 'machine':${KBRANCH}, 'meta':'meta'}

* generic revision handling extension
the related revision handling code in fetch2.__init__.py are changed accordingly. the major change is add name parameter to indicate which src rev to handling. originally there is one src rev per FetchData, so FetchData parameter is enough. now since one FetchData has multiple src rev, it is necessary to use FetchData + name to specifiy src rev.

* git extension
git fetcher are also revised to take advantage of the multiple src rev in FetchData. especially the download() method are enhanced to fetch multiple src rev.

* other fetcher (svn, hg, ...) does not support multiple src rev. they just sync the API to add name, and then simply ignore the name. no actually functional change

(From Poky rev: 0e837e6844be449659bb96a1498e54a8b9442d13)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agogit.py: Remove the source tree tarball archives
Yu Ke [Tue, 18 Jan 2011 16:58:42 +0000 (00:58 +0800)]
git.py: Remove the source tree tarball archives

Since we're now always providing the git source control files it becomes
pointless to handle the tarballs of specific git revisions so drop this
part of the fetcher.

(From Poky rev: affcfe468a0c2993c0c4ace446248f85aee4315f)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2/git: Add nocheckout option to disable checkouts and always add scm...
Richard Purdie [Wed, 2 Feb 2011 12:48:32 +0000 (12:48 +0000)]
bitbake/fetch2/git: Add nocheckout option to disable checkouts and always add scm data to checkouts

(From Poky rev: 05048e0f9168ceb7d66f6ac79dcae42f1e696826)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobb.fetch2: Add git unpack
Yu Ke [Tue, 18 Jan 2011 16:22:13 +0000 (00:22 +0800)]
bb.fetch2: Add git unpack

The git download method clones the git repository to the local machine. The unpack process
can be optimised to be a local to local machine clone or a direct readtree operation to the
destination using git.will clone git repo to local, so git unpack can be simplified
to only checkouting the code to the work dir. For fullclone case, we also
need to manually copy all the ref info, which is needed by the later do_kernel_checkout().
Rather than use hardlinks, we reference the repository using alternatives since the
download directory may be on a different filesystem.

[Change to use -s by Richard Purdie]

(From Poky rev: 3a3fc6b071f09970e7f79fb4f1a8f0013917371e)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Ensure the local revision counter takes a default value of 0, not...
Richard Purdie [Tue, 1 Feb 2011 23:33:19 +0000 (23:33 +0000)]
bitbake/fetch2: Ensure the local revision counter takes a default value of 0, not None

(From Poky rev: 05954ef4d7d882f34e2bb1f3bc44ad6f80c11d4c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobitbake/fetch2: Instrument fetchers when making network access
Yu Ke [Mon, 24 Jan 2011 07:56:54 +0000 (15:56 +0800)]
bitbake/fetch2: Instrument fetchers when making network access

(From Poky rev: 029f8584d547c0792ffbe2f83451dcdfe2a3db7f)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobb.fetch2: add "BB_NO_NETWORK" option
Yu Ke [Mon, 24 Jan 2011 06:58:26 +0000 (14:58 +0800)]
bb.fetch2: add "BB_NO_NETWORK" option

Sometime user want a purely local fetching, i.e. using local mirror without
any remote netowrk access. BB_NO_NETWORK option is introduced for this purpose

check_network_access() is the guard for BB_NO_NETWOKR option. it should be
put in any place that fetcher use network access

(From Poky rev: 098e8ded339f3bf864f3bad9871028176f70b12b)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobb.fetch2: remove the obsolate Fetch.try_mirrors referrence
Yu Ke [Tue, 18 Jan 2011 16:17:39 +0000 (00:17 +0800)]
bb.fetch2: remove the obsolate Fetch.try_mirrors referrence

Fetch.try_mirrors is no longer exists, so the code is obsolate

(From Poky rev: 733de7596c2ed78a846541b3290f01c21ff96606)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agogit.py: split download to download() and build_mirror_data()
Yu Ke [Tue, 18 Jan 2011 15:35:30 +0000 (23:35 +0800)]
git.py: split download to download() and build_mirror_data()

the download is to fetch the source from URL, the build_mirror_data is
to create the mirror tar ball. the original go() method mix them together,
it is more clean to split them.

(From Poky rev: ef918a72de97fd2189e1c8487e371d13e18088fd)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
9 years agobb.fetch2: rename "go" with "download" to better reflect its functionality
Yu Ke [Tue, 18 Jan 2011 15:03:53 +0000 (23:03 +0800)]
bb.fetch2: rename "go" with "download" to better reflect its functionality

no functional change

(From Poky rev: e05918937c515dff845fcb4c9e94f8ecbea8c957)

Signed-off-by: Yu Ke <ke.yu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>