Commit 5b79bbb7 authored by Tristan Van Berkom's avatar Tristan Van Berkom
Browse files

Merge branch 'tristan/debug-symbols-location' into 'master' 

Don't strip pathname from debug symbol files

See merge request !697
parents ff52ae18 f4e51cf1

buildstream/data/projectconfig.yaml

+2 −2
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ variables: 
  # Generic implementation for stripping debugging symbols

  strip-binaries: |



    find "%{install-root}" -type f \

    cd "%{install-root}" && find -type f \

      '(' -perm -111 -o -name '*.so*' \

          -o -name '*.cmxs' -o -name '*.node' ')' \

      -exec sh -ec \
@@ -76,7 +76,7 @@ variables: 
       if [ "$hdr" != "$(printf \\x7fELF)" ]; then

           exit 0

       fi

       debugfile="%{install-root}%{debugdir}/$(basename "$1")"

       debugfile="%{install-root}%{debugdir}/$1"

       mkdir -p "$(dirname "$debugfile")"

       objcopy %{objcopy-extract-args} "$1" "$debugfile"

       chmod 644 "$debugfile"

tests/cachekey/project/elements/build1.expected

+1 −1
Original line number Diff line number Diff line 
90fa9c1b5334aac3bfd8956d92af0a91e2f2bbcbcac73861957165e577bc8768
 
 No newline at end of file
 
05429485dff08bdb968f7d10c2cdda63be49c8a783d54863a0d4abce44bbebe9
 
 No newline at end of file

tests/cachekey/project/elements/build2.expected

+1 −1
Original line number Diff line number Diff line 
a62c29fe4e05820412e391430f61aa88a1a82e138de8cac726a9dc4fcd7ed8b9
 
 No newline at end of file
 
4155c7bc836cdb092de3241fa92883bd8c7dd94c55affa406e559aeb6252c669
 
 No newline at end of file

tests/cachekey/project/target.expected

+1 −1
Original line number Diff line number Diff line 
09620aa58875d96611d22632b7585a0f22f88f5ecca6f5d1915d3e529d036bd8
 
 No newline at end of file
 
f5affaacd3ac724f5415a7a8349c6dca6122841dd7f9769de4f9d6cb7185f9b8
 
 No newline at end of file

tests/examples/autotools.py

+3 −1
Original line number Diff line number Diff line
@@ -28,7 +28,9 @@ def test_autotools_build(cli, tmpdir, datafiles): 


    assert_contains(checkout, ['/usr', '/usr/lib', '/usr/bin',

                               '/usr/share', '/usr/lib/debug',

                               '/usr/lib/debug/hello', '/usr/bin/hello',

                               '/usr/lib/debug/usr', '/usr/lib/debug/usr/bin',

                               '/usr/lib/debug/usr/bin/hello',

                               '/usr/bin/hello',

                               '/usr/share/doc', '/usr/share/doc/amhello',

                               '/usr/share/doc/amhello/README'])