diff options
author | Enrico Scholz <enrico.scholz@sigma-chemnitz.de> | 2012-01-12 17:30:20 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-01-17 14:53:22 +0000 |
commit | 866ed43c12a76c3bf8769f59215c5672c5c5b25c (patch) | |
tree | adfbd29ceaf559fdc69eba12b19916673f4e90f7 /meta/classes | |
parent | f20d49315dc2ace002c2671c746d274198ef3976 (diff) | |
download | poky-866ed43c12a76c3bf8769f59215c5672c5c5b25c.tar.gz |
package.bbclass: quote pathname given to objdump
Packaging will fail with executable files containing spaces in their
names. Patch quotes the parameter passed to 'objdump'.
(From OE-Core rev: 7f7db286ca0b70bd5cce643c3b84f77ad45cc786)
Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f8f0a12dc1..108847094e 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
@@ -1205,7 +1205,7 @@ SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs" | |||
1205 | SHLIBSWORKDIR = "${WORKDIR}/shlibs" | 1205 | SHLIBSWORKDIR = "${WORKDIR}/shlibs" |
1206 | 1206 | ||
1207 | python package_do_shlibs() { | 1207 | python package_do_shlibs() { |
1208 | import re | 1208 | import re, pipes |
1209 | 1209 | ||
1210 | exclude_shlibs = d.getVar('EXCLUDE_FROM_SHLIBS', 0) | 1210 | exclude_shlibs = d.getVar('EXCLUDE_FROM_SHLIBS', 0) |
1211 | if exclude_shlibs: | 1211 | if exclude_shlibs: |
@@ -1234,7 +1234,7 @@ python package_do_shlibs() { | |||
1234 | lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) | 1234 | lf = bb.utils.lockfile(bb.data.expand("${PACKAGELOCK}", d)) |
1235 | 1235 | ||
1236 | def linux_so(root, path, file): | 1236 | def linux_so(root, path, file): |
1237 | cmd = d.getVar('OBJDUMP', True) + " -p " + os.path.join(root, file) + " 2>/dev/null" | 1237 | cmd = d.getVar('OBJDUMP', True) + " -p " + pipes.quote(os.path.join(root, file)) + " 2>/dev/null" |
1238 | cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) | 1238 | cmd = "PATH=\"%s\" %s" % (d.getVar('PATH', True), cmd) |
1239 | fd = os.popen(cmd) | 1239 | fd = os.popen(cmd) |
1240 | lines = fd.readlines() | 1240 | lines = fd.readlines() |