From patchwork Mon Jun 30 11:53:18 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 32704 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f70.google.com (mail-qa0-f70.google.com [209.85.216.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 20EB9203C0 for ; Mon, 30 Jun 2014 12:31:30 +0000 (UTC) Received: by mail-qa0-f70.google.com with SMTP id dc16sf15679905qab.5 for ; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=THcfpKA2GkRNtyr83UTiCLC4920ojMh3kOJE2JxRKRE=; b=ZNwf2wTtT8BVrmgMSKdm1Sm+0rsRknnKK4NAr0CwpCD8ncBejRNOQ4Wqj6QWH1pNL5 3sqARqgYnhxsJC8LzQJI2gNOHz2ElyD1Tseu80wMu39Ab3Elmp5IAw6BP8JJNK1c++xf 6xpFD5+h/xCCsEEGOezqxHFrhNWGzi2x9bv10AUXJlWDwDUty6uitE66efZMlTCvIoly yG8UeTdzH3iK5iJQ3vIUZF8tDMEqXCR7iwYweBeuf2AgEN3I3YiDK9eBsKb8FxtSrQbo wq/4Wl/fcDJwayb4oLgjru8wQC0R7KpzqxeXhjDy9tb5zS+LS8Kj/3udmnZFlQVdwiZn nEcQ== X-Gm-Message-State: ALoCoQnHUVCxscl6uUtw4sci5yZ2dbkApXCghoqAGkiBqKYkY86js/cu9QY5oB1Q1sTh7hrLQUML X-Received: by 10.58.37.164 with SMTP id z4mr22699171vej.28.1404131490815; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.23.136 with SMTP id 8ls1388397qgp.33.gmail; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) X-Received: by 10.58.56.71 with SMTP id y7mr38130301vep.24.1404131490734; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) Received: from mail-vc0-f173.google.com (mail-vc0-f173.google.com [209.85.220.173]) by mx.google.com with ESMTPS id p7si9946584vdp.5.2014.06.30.05.31.30 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Jun 2014 05:31:30 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) client-ip=209.85.220.173; Received: by mail-vc0-f173.google.com with SMTP id lf12so7442656vcb.18 for ; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) X-Received: by 10.52.138.232 with SMTP id qt8mr782383vdb.44.1404131490638; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp134166vcb; Mon, 30 Jun 2014 05:31:30 -0700 (PDT) X-Received: by 10.68.137.193 with SMTP id qk1mr51560081pbb.155.1404131489853; Mon, 30 Jun 2014 05:31:29 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id rz10si23022638pbc.56.2014.06.30.05.31.28; Mon, 30 Jun 2014 05:31:28 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754186AbaF3Mai (ORCPT + 27 others); Mon, 30 Jun 2014 08:30:38 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:53045 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753907AbaF3Maf (ORCPT ); Mon, 30 Jun 2014 08:30:35 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.80.1) (envelope-from ) id 1X1a9K-0000xK-3g; Mon, 30 Jun 2014 13:53:30 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Fathi Boudra , Michal Marek , Jiri Slaby Subject: [PATCH 3.12 177/181] builddeb: use $OBJCOPY variable instead of objcopy Date: Mon, 30 Jun 2014 13:53:18 +0200 Message-Id: <56044e30eaf5fd87562183b0b7c5e6697e61caf8.1404128998.git.jslaby@suse.cz> X-Mailer: git-send-email 2.0.0 In-Reply-To: <61844d8e25eb8899b0836afa9796fa239db80f1f.1404128997.git.jslaby@suse.cz> References: <61844d8e25eb8899b0836afa9796fa239db80f1f.1404128997.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.173 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Fathi Boudra 3.12-stable review patch. If anyone has any objections, please let me know. =============== 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 Fixes: 810e843746b7 ('deb-pkg: split debug symbols in their own package') Reviewed-by: Ben Hutchings Signed-off-by: Michal Marek Signed-off-by: Jiri Slaby --- scripts/package/builddeb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index c1bb9be00fa0..6d02fd5d59bd 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -155,11 +155,11 @@ if grep -q '^CONFIG_MODULES=y' $KCONFIG_CONFIG ; then 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