diff options
| author | Valentin David <valentin.david@gmail.com> | 2018-11-08 10:01:39 +0000 |
|---|---|---|
| committer | Valentin David <valentin.david@gmail.com> | 2018-11-08 10:01:39 +0000 |
| commit | 83d153506691b8f6bdd161f5c71154df755f8b2d (patch) | |
| tree | db9343fbcc5b79b5b9c8aab5074dab957dbc5b1f | |
| parent | f24e20e991df21a50298cd75bd0c02004550b213 (diff) | |
| parent | e28f668a14d4be083d9b62a9763d0f7d2087c214 (diff) | |
| download | buildstream-83d153506691b8f6bdd161f5c71154df755f8b2d.tar.gz | |
Merge branch 'valentindavid/fix-recursive-strip-debug' into 'master'
Fix infinite recursion in default strip debug command
Closes #645
See merge request BuildStream/buildstream!918
| -rw-r--r-- | buildstream/data/projectconfig.yaml | 5 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/build1.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/elements/build2.expected | 2 | ||||
| -rw-r--r-- | tests/cachekey/project/target.expected | 2 |
4 files changed, 8 insertions, 3 deletions
diff --git a/buildstream/data/projectconfig.yaml b/buildstream/data/projectconfig.yaml index bc9e5147d..36d4298fe 100644 --- a/buildstream/data/projectconfig.yaml +++ b/buildstream/data/projectconfig.yaml @@ -62,6 +62,11 @@ variables: -o -name '*.cmxs' -o -name '*.node' ')' \ -exec sh -ec \ 'read -n4 hdr <"$1" # check for elf header + case "$1" in + %{install-root}%{debugdir}/*) + exit 0 + ;; + esac if [ "$hdr" != "$(printf \\x7fELF)" ]; then exit 0 fi diff --git a/tests/cachekey/project/elements/build1.expected b/tests/cachekey/project/elements/build1.expected index 42d0261e3..27d9595e8 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -dd5e29baefb84f68eb4abac3a1befc332077ec4c97bb2572e57f3ca98ba46707
\ No newline at end of file +ce0ddf7126d45d14f5ec1a525337c39ec8ddbbe4b0ec2ef51bae777619ed39bb
\ No newline at end of file diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected index cc2026064..21328c966 100644 --- a/tests/cachekey/project/elements/build2.expected +++ b/tests/cachekey/project/elements/build2.expected @@ -1 +1 @@ -99d80454cce44645597c885800edf0bf254d1c3606d869f2ccdd5043ec7685cb
\ No newline at end of file +5e2a48dbeae43f6bab84071dbd02345a3aa32a473c189645ab26f3d5d6cfe547
\ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index 70dcca363..640133e23 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -29a1252ec30dd6ae73c772381f0eb417e3874c75710d08be819f5715dcaa942b
\ No newline at end of file +125d9e7dcf4f49e5f80d85b7f144b43ed43186064afc2e596e57f26cce679cf5
\ No newline at end of file |