On 01/24/2013 06:38 PM, Jason Wessel wrote:
> There are two cases of corruption that the relocate_sdk.py was not correctly
> dealing with.
>
> 1) SDK Extras should be left alone
> Extra external binaries included in an SDK that were linked against the
> host's version of /usr/lib/ld-so.so should not get a relocation applied.
> In the case that was discovered these were LSB compliant binaries that
> already worked on many hosts.
>
> 2) If the interp section is too small generate an error
> In the case of the qemu user code, it was using its own .ld file
> to link the executables which overrides the default in the nativesdk
> binutils. This generated host executables which had a interp section
> that was too small to relocate.
>
> Now the relocate_sdk.py will print an error and continue on such that
> the error can be fixed by a developer without having to do the
> difficult task of debugging why it is crashing or not loading correctly.
>
> Signed-off-by: Jason Wessel <jason.wes...@windriver.com>
> ---
> scripts/relocate_sdk.py | 17 +++++++++++++----
> 1 files changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py
> index 74bb7a5..3e3181f 100755
> --- a/scripts/relocate_sdk.py
> +++ b/scripts/relocate_sdk.py
> @@ -66,7 +66,7 @@ def parse_elf_header():
> e_ehsize, e_phentsize, e_phnum, e_shentsize, e_shnum, e_shstrndx =\
> hdr_struct.unpack(elf_header[16:hdr_size])
>
> -def change_interpreter():
> +def change_interpreter(elf_file_name):
> if arch == 32:
> ph_struct = struct.Struct("<IIIIIIII")
> else:
> @@ -89,8 +89,17 @@ def change_interpreter():
> if p_type == 3:
> # PT_INTERP section
> f.seek(p_offset)
> - dl_path = new_dl_path + "\0" * (p_filesz - len(new_dl_path))
> - f.write(dl_path)
> + dl_path = new_dl_path + "\0"
> + # External SDKs with mixed pre-compiled binaries should not get
> + # relocated so look for some variant of /lib
> + fname = f.read(11)
> + if fname.startswith("/lib/") or fname.startswith("/lib64/") or
> fname.startswith("/lib32/") or fname.startswith("/usr/lib32/") or
> fname.startswith("/usr/lib32/") or fname.startswith("/usr/lib64/"):
> + break
> + if (len(dl_path) >= p_memsz):
> + print "ERROR: could not relocate %s, interp size = %i and %i
> is needed." % (elf_file_name, p_memsz, len(dl_path))
> + break
> + f.seek(p_offset)
> + f.write(dl_path )oops... Need a yocto check patch for python white space eh? Attached is the fixed version. Cheers, Jason.
0001-relocate_sdk.py-Fix-corruption-of-sdk-binaries.patch
Description: application/mbox
_______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
