diff options
| author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-19 16:39:51 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-23 08:08:19 +0000 |
| commit | d820303f64ea610338ec11ffd79269e7831d1da9 (patch) | |
| tree | 13d578d5477e10c28991104da412a70c16c8772b | |
| parent | 4b4f2d4f2869d6d5d564cc1b2d733f41ab5a3b9b (diff) | |
| download | openembedded-core-d820303f64ea610338ec11ffd79269e7831d1da9.tar.gz openembedded-core-d820303f64ea610338ec11ffd79269e7831d1da9.tar.bz2 openembedded-core-d820303f64ea610338ec11ffd79269e7831d1da9.zip | |
lib/oe/patch: fix PATCHTOOL = "git" with source in a subdirectory
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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/lib/oe/patch.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index b838be80be..f68d40f8c8 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -313,9 +313,12 @@ class GitApplyTree(PatchTree): return runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) # Add hooks which add a pointer to the original patch file name in the commit message - commithook = os.path.join(self.dir, '.git', 'hooks', 'commit-msg') + reporoot = (runcmd("git rev-parse --show-toplevel".split(), self.dir) or '').strip() + if not reporoot: + raise Exception("Cannot get repository root for directory %s" % self.dir) + commithook = os.path.join(reporoot, '.git', 'hooks', 'commit-msg') commithook_backup = commithook + '.devtool-orig' - applyhook = os.path.join(self.dir, '.git', 'hooks', 'applypatch-msg') + applyhook = os.path.join(reporoot, '.git', 'hooks', 'applypatch-msg') applyhook_backup = applyhook + '.devtool-orig' if os.path.exists(commithook): shutil.move(commithook, commithook_backup) |