lkml.org 
[lkml]   [2014]   [Jun]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.14 109/110] builddeb: use $OBJCOPY variable instead of objcopy
    Date
    3.14-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Fathi Boudra <fathi.boudra@linaro.org>

    commit 6b4a144a92ab81a1f45fb9b12aebaaaee0d08120 upstream.

    In cross-build environment, we expect to use the cross-compiler objcopy
    instead of the host objcopy.

    It fixes following build failures:
    objcopy --only-keep-debug lib/modules/3.14/kernel/net/ipv6/xfrm6_mode_tunnel.ko /srv/build/linux/debian/dbgtmp/usr/lib/debug/lib/modules/3.14/kernel/net/ipv6/xfrm6_mode_tunnel.ko
    objcopy: Unable to recognise the format of the input file `lib/modules/3.14/kernel/net/ipv6/xfrm6_mode_tunnel.ko'

    Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
    Fixes: 810e843746b7 ('deb-pkg: split debug symbols in their own package')
    Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
    Signed-off-by: Michal Marek <mmarek@suse.cz>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    scripts/package/builddeb | 6 +++---
    1 file changed, 3 insertions(+), 3 deletions(-)

    --- a/scripts/package/builddeb
    +++ b/scripts/package/builddeb
    @@ -155,11 +155,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_
    for module in $(find lib/modules/ -name *.ko); do
    mkdir -p $(dirname $dbg_dir/usr/lib/debug/$module)
    # only keep debug symbols in the debug file
    - objcopy --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
    + $OBJCOPY --only-keep-debug $module $dbg_dir/usr/lib/debug/$module
    # strip original module from debug symbols
    - objcopy --strip-debug $module
    + $OBJCOPY --strip-debug $module
    # then add a link to those
    - objcopy --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
    + $OBJCOPY --add-gnu-debuglink=$dbg_dir/usr/lib/debug/$module $module
    done
    )
    fi



    \
     
     \ /
      Last update: 2014-06-28 21:21    [W:2.744 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site