openembedded-core.git/meta/lib/oe/patch.py, branch 2015-4

lib/oe/patch: fix PATCHTOOL = "git" with source in a subdirectory

2015-02-23T08:08:19+00:00

For recipes that have their actual source in a subdirectory of what is
fetched (e.g. mkelfimage), we need to find the root of the repository
within the GitApplyTree code that attempts to set up the required git
hooks and use that, rather than expecting the root to be the same as
${S}.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

lib/oe/patch: add support for extracting patches from git tree

2014-12-21T12:37:19+00:00

When patches from a recipe have been written out to a git tree, we also
want to be able to do the reverse so we can update the patches next to
the recipe. This is implemented by adding a comment to each commit
message (using git hooks) which we can extract later on.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

lib/oe/patch.py: abort "git am" if it fails

2014-12-21T12:37:18+00:00

If we don't do this, you may still be in the git am resolution mode at
the end of applying patches, which is not desirable.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

lib/oe/patch: use --keep-cr with git am

2014-12-21T12:37:18+00:00

Preserving carriage returns is important where the patch contains them.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

lib/oe/patch: auto-commit when falling back from git am

2014-12-21T12:37:18+00:00

When PATCHTOOL = "git", if we're not able to use "git am" to apply a
patch and fall back to "git apply" or "patch", it is desirable to
actually commit the changes, attempting to preserve (and interpret) the
patch header as part of the commit message if present. As a bonus, the
code for extracting the commit message is callable externally in case it
is useful elsewhere.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

lib/oe/patch: fall back to patch if git apply fails

2014-12-21T12:37:18+00:00

When PATCHTOOL = "git", git apply doesn't support fuzzy application, so
if a patch requires that it's better to be able to apply it rather than
just failing.

Signed-off-by: Paul Eggleton 
Signed-off-by: Richard Purdie

lib/oe/patch.py: Prefer "git am" over "git apply" when applying git patches

2014-01-28T00:48:25+00:00

It is better to use "git am" when possible to preserve the commit messages and
the mail format in general for patches when those are present. A typical use
case is when developers would like to keep the changes on top of the latest
upstream, and they may occasionally need to rebase. This is not possible with
"git diff" and "diff" generated patches.

Since this is not always the case, the fallback would be the "git apply"
operation which is currently available.

Signed-off-by: Laszlo Papp 
Signed-off-by: Saul Wold

meta: Don't use deprecated bitbake API

2013-09-01T14:51:36+00:00

These have been deprecated for a long time, convert the remaining
references to the correct modules and prepare for removal of the
compatibility support from bitbake.

Signed-off-by: Richard Purdie

classes/lib: Fix getcmdstatus breakage

2013-05-09T15:05:02+00:00

I mistakenly thought subprocess had getcmdstatus in python 2. It doesn't so lets
add a wrapper and have this work in both worlds.

Signed-off-by: Richard Purdie

sanity/patch.py: Remove commands module usage

2013-05-09T13:04:19+00:00

The commands module is removed in python3. Use the subprocess module instead
and the pipes module to replace the mkargs usage.

Signed-off-by: Richard Purdie