[oe] [meta-oe][PATCH] breakpad: fix patch striplevel to avoid 'devtool modify breakpad' error

Chris Laplante chris.laplante at agilent.com
Tue Aug 27 21:51:41 UTC 2019


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 at 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 at agilent.com>
---
 meta-oe/recipes-devtools/breakpad/breakpad_git.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-devtools/breakpad/breakpad_git.bb b/meta-oe/recipes-devtools/breakpad/breakpad_git.bb
index 5f9a72e..06f3ee8 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"
 
-- 
2.7.4



More information about the Openembedded-devel mailing list