openembedded-core.git/meta/lib/oe/patch.py, branch uninative-1.0

oe/patch: print cleaner error message when patch fails to apply

2016-04-03T14:51:08+00:00

[YOCTO #9344]

Signed-off-by: Markus Lehtonen 
Signed-off-by: Richard Purdie

oe/patch: more detailed error reporting

2016-04-03T14:51:08+00:00

Show the actual command that failed when raising a CmdError. Makes
figuring out what actually failed much easier.

[YOCTO #9344]

Signed-off-by: Markus Lehtonen 
Signed-off-by: Richard Purdie

devtool: commit for extra tasks that modify source when extracting

2016-02-11T12:32:55+00:00

When extracting source for a recipe, if there are additional custom
tasks run that make changes to the source, create a commit in the
generated git branch so they are contained. This is particularly
useful for tasks that come before do_patch since otherwise the changes
might get incorporated in the first applied patch, but otherwise it
helps avoid the tree being dirty at any point.

Fixes [YOCTO #7626].

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

lib/oe/patch: Make GitApplyTree._applypatch() support read-only .git/hooks

2016-01-29T18:14:54+00:00

Rather than modifying files in .git/hooks, which can be read-only
(e.g., if it is a link to a directory in /usr/share), move away the
entire .git/hooks directory temporarily.

Signed-off-by: Peter Kjellerstedt 
Signed-off-by: Ross Burton

lib/oe/patch: improve extraction of patch header

2015-12-01T21:30:54+00:00

For patches that we have to extract the header information by hand (i.e.
will not apply with "git am"), make the following improvements:

* If we can't extract author/date/subject, then try to do so from the
  commit that added the patch in git (assuming the metadata is tracked
  by git)
* Take only first Signed-off-by line instead of last
* Accept any case for "Signed-off-by" in case author has typed it by
  hand
* Improve conditional - we can skip the other cases if one matches

Implements [YOCTO #7624].

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton

oe.patch.GitApplyTree: add paths argument to extractPatches

2015-09-29T14:15:47+00:00

Makes it possible to define which paths are included in the patches.

Signed-off-by: Markus Lehtonen

lib/oe/patch: fix for git am not cleaning up after itself

2015-09-22T17:12:53+00:00

Unfortunately it appears that under certain circumstances, a failed
git am followed by git am --abort won't clean up any changes the patch
might have made - this was seen when running "devtool extract" on the
unzip recipe; unzip-6.0_overflow3.diff has a malformed date as far as
git am is concerned but it triggers this condition. Add a
git reset --hard HEAD followed by git clean -f in order to recover from
this scenario.

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

lib/oe/patch: handle patches that delete files with older git

2015-08-30T11:34:22+00:00

When running "git add" on a directory with older git versions, deleted
files aren't added to what is to be committed unless you explicitly
specify the -A option. The result of this is that when applying a patch
from a recipe which doesn't apply with "git am" (and we fall back to
applying the patch through other means then "git add" following by
a "git commit") these deletes weren't committed with the patch, leaving
them sitting deleted but not committed at the end.

This should fix test_devtool_modify_native (which unwittingly exercises
this scenario by attempting to run "devtool modify" on apt-native) on
machines with older git versions.

Signed-off-by: Paul Eggleton 
Signed-off-by: Ross Burton

lib/oe/patch: Fix git patch application for source in subdirectory

2015-06-26T08:25:51+00:00

Similarly to:
http://git.yoctoproject.org/cgit.cgi/poky/commit/meta/lib/oe/patch.py?id=f205ccaf48ac36f4b26efc4aeb2e9d2939b28646
we need to fix patch application for source which is in a subdirectory.

Passing "." as the git directory or work-dir appears to work (or is ignored)
in some versions of git but does not work in others, probably quite correctly.

Since we have reporoot from the above patch, pass this in directly.

This bug caused this sanity test failure on some machines:

FAIL: test_devtool_modify_git (oeqa.selftest.devtool.DevtoolTests)
----------------------------------------------------------------------
Traceback (most recent call last):
  File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/devtool.py", line 390, in test_devtool_modify_git
    self.assertEqual(result.output.strip(), "", 'Created git repo is not clean')
AssertionError: '?? util/mkelfImage/patches/' != '' : Created git repo is not clean

since git apply would fail, it would then fall back to quilt
and the git tree would be left unclean.

[YOCTO #7911]

Signed-off-by: Richard Purdie

recipetool: add appendfile subcommand

2015-05-19T07:16:47+00:00

Locating which recipe provides a file in an image that you want to
modify and then figuring out how to bbappend the recipe in order to
replace it can be a tedious process. Thus, add a new appendfile
subcommand to recipetool, providing the ability to create a bbappend
file to add/replace any file in the target system. Without the -r
option, it will search for the recipe packaging the specified file
(using pkgdata from previously built recipes). The bbappend will be
created at the appropriate path within the specified layer directory
(which may or may not be in your bblayers.conf) or if one already exists
it will be updated appropriately.

Fairly extensive oe-selftest tests are also provided.

Implements [YOCTO #6447].

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