diff options
| author | Valentin David <valentin.david@codethink.co.uk> | 2018-11-01 12:17:35 +0100 |
|---|---|---|
| committer | Valentin David <valentin.david@codethink.co.uk> | 2018-11-22 13:01:28 +0100 |
| commit | 76c26d0b894fa4ef66665b1732c965ea2bbf5be7 (patch) | |
| tree | 6c3b77337f54f5b1930cc993c447f44b7bbd498c | |
| parent | 603490729b4bb766327095ef283b29cde680597d (diff) | |
| download | buildstream-valentindavid/fix-recursive-strip-debug-1.2.tar.gz | |
Fix infinite recursion in default strip debug commandvalentindavid/fix-recursive-strip-debug-1.2
Fixes #645.
| -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 247a4536a..1010caf6b 100644 --- a/buildstream/data/projectconfig.yaml +++ b/buildstream/data/projectconfig.yaml @@ -63,6 +63,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 750d06234..bfe2302b3 100644 --- a/tests/cachekey/project/elements/build1.expected +++ b/tests/cachekey/project/elements/build1.expected @@ -1 +1 @@ -afab4c1a67d1e06489083fa1559bda0b2c8df9b7bc239820ed7cdab30c988a4e
\ No newline at end of file +b091247326a9d4a913011a66304c456f27f023a43c8c2e9fd92d16b03b48d1dd
\ No newline at end of file diff --git a/tests/cachekey/project/elements/build2.expected b/tests/cachekey/project/elements/build2.expected index 3b40d2ddf..47d75d093 100644 --- a/tests/cachekey/project/elements/build2.expected +++ b/tests/cachekey/project/elements/build2.expected @@ -1 +1 @@ -47395a4e6c86372b181ad1fd6443e11b1ab54c480b7be5e5fe816d84eec3b369
\ No newline at end of file +228a520e48f44465733a9d0e9e7fa7c0694f9983a42c372bff2a182bced98678
\ No newline at end of file diff --git a/tests/cachekey/project/target.expected b/tests/cachekey/project/target.expected index 5fcd89438..21f24ddd2 100644 --- a/tests/cachekey/project/target.expected +++ b/tests/cachekey/project/target.expected @@ -1 +1 @@ -46f48e5c0ff52370ff0cf2bb23bd2c79da23141e6c17b9aa720f7d97b7194340
\ No newline at end of file +af7910519ec114a78869df2588757073ef15ffc28532ea1b0f46f16451b0fb75
\ No newline at end of file |