diff options
| author |   Chris Laplante <chris.laplante@agilent.com> | 2019-08-27 17:51:41 -0400 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-08-28 07:14:35 -0700 |
| commit | 3ac60b4903a20079851617f3369e4aefbae1b8d3 (patch) | |
| tree | 2b27f4ffb67dba922c95f228dc9b106e7d175078 /meta-oe | |
| parent | 98625eb6c501d74d18e728a8b34e9719c7011f1b (diff) | |
| download | meta-openembedded-contrib-3ac60b4903a20079851617f3369e4aefbae1b8d3.tar.gz | |
breakpad: fix patch striplevel to avoid 'devtool modify breakpad' error
Since the patch is modifying files in a self-contained git repo that is
.gitignored, git ends up thinking we have just touched a submodule.
This leads to 'devtool modify breakpad' failing with:
Exception: bb.process.ExecutionError: Execution of 'git add .; git -c
user.name="OpenEmbedded" -c user.email="oe.patch@oe" commit -a -m
"Committing changes from do_patch
%% ignore - from do_patch"' failed with exit code 1:
On branch devtool
Changes not staged for commit:
modified: src/third_party/lss (modified content)
no changes added to commit
ERROR: Function failed: patch_task_postfunc
Signed-off-by: Chris Laplante <chris.laplante@agilent.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
| -rw-r--r-- | meta-oe/recipes-devtools/breakpad/breakpad_git.bb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb index 5f9a72e0ac..06f3ee87da 100644 --- a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb +++ b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb @@ -42,7 +42,7 @@ SRC_URI = "git://github.com/google/breakpad;name=breakpad \ file://0001-disable-calls-to-getcontext-with-musl.patch \ file://0001-lss-Match-syscalls-to-match-musl.patch;patchdir=src/third_party/lss \ file://mips_asm_sgidefs.patch;patchdir=src/third_party/lss \ - file://dont-clobber-rsp.patch \ + file://dont-clobber-rsp.patch;patchdir=src/third_party/lss;striplevel=4 \ " S = "${WORKDIR}/git" |