]> code.ossystems Code Review - openembedded-core.git/commit
lib/oe/patch: Fix git patch application for source in subdirectory
authorRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 25 Jun 2015 15:08:26 +0000 (16:08 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Fri, 26 Jun 2015 08:25:51 +0000 (09:25 +0100)
commit91d76e632336d6af96f24bcf92be25f41a216856
treedf7b0134998e85e91a3102258e66e8a05e18ff2a
parent08c50d62b520c8405f034e3d7adeea89e06226ee
lib/oe/patch: Fix git patch application for source in subdirectory

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 <richard.purdie@linuxfoundation.org>
meta/lib/oe/patch.py