[oe-commits] Laurentiu Palcu : relocate_sdk.py: new interpreter string was not '\0' terminated

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: danny
Commit: 0b4287dae51f7a4175c0ad3cadbec6cdf0b43866
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=0b4287dae51f7a4175c0ad3cadbec6cdf0b43866

Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date:   Mon Jan  7 15:07:04 2013 +0200

relocate_sdk.py: new interpreter string was not '\0' terminated

The problem: SDK binaries were not properly relocated when the SDK
was installed into a path that had a length less than the default one.
Apparently, there were two problems here: the padding was done wrong
(the size of one program header table entry was used instead of the
program section size) and the new padded string was not used at all.

[YOCTO #3655]

Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/relocate_sdk.py |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py
index 637ffe9..74bb7a5 100755
--- a/scripts/relocate_sdk.py
+++ b/scripts/relocate_sdk.py
@@ -89,8 +89,8 @@ def change_interpreter():
         if p_type == 3:
             # PT_INTERP section
             f.seek(p_offset)
-            dl_path = new_dl_path + "\0" * (e_phentsize - len(new_dl_path))
-            f.write(new_dl_path)
+            dl_path = new_dl_path + "\0" * (p_filesz - len(new_dl_path))
+            f.write(dl_path)
             break
 
 def change_dl_sysdirs():