[oe-commits] [meta-openembedded] 02/15: breakpad: fix patch striplevel to avoid 'devtool modify breakpad' error

git at git.openembedded.org git at git.openembedded.org
Wed Aug 28 14:16:38 UTC 2019


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 3ac60b4903a20079851617f3369e4aefbae1b8d3
Author: Chris Laplante <chris.laplante at agilent.com>
AuthorDate: Tue Aug 27 17:51:41 2019 -0400

    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 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>
    Signed-off-by: Khem Raj <raj.khem at gmail.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"
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list