[gnome-continuous-yocto/gnomeostree-3.28-rocko: 5002/8267] relocate_sdk.py: skip debug files from relocation



commit d49dba9a6a785dbe1db488cbf9167c2994dad735
Author: Nikunj Kela <nkela cisco com>
Date:   Tue Feb 14 18:15:28 2017 +0000

    relocate_sdk.py: skip debug files from relocation
    
    Debug files only have debug symbols hence don't need
    to be relocated. Relocation script throws errors when
    run on the debug files. This change skips these files
    that have zero size.
    
    (From OE-Core rev: 132e8bfd499c713eb63075fd6380317b60f0bd27)
    
    (From OE-Core rev: 93b73b2495f9cb18741837c5437de629adfd3780)
    
    Signed-off-by: Nikunj Kela <nkela cisco com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 scripts/relocate_sdk.py |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
---
diff --git a/scripts/relocate_sdk.py b/scripts/relocate_sdk.py
index e47b4d9..c752fa2 100755
--- a/scripts/relocate_sdk.py
+++ b/scripts/relocate_sdk.py
@@ -103,6 +103,8 @@ def change_interpreter(elf_file_name):
                fname.startswith(b("/lib32/")) or fname.startswith(b("/usr/lib32/")) or \
                fname.startswith(b("/usr/lib32/")) or fname.startswith(b("/usr/lib64/")):
                 break
+            if p_filesz == 0:
+                break
             if (len(new_dl_path) >= p_filesz):
                 print("ERROR: could not relocate %s, interp size = %i and %i is needed." \
                     % (elf_file_name, p_memsz, len(new_dl_path) + 1))


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]