From patchwork Tue May 7 15:46:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anisse Astier X-Patchwork-Id: 242379 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 947872C015E for ; Wed, 8 May 2013 01:48:09 +1000 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UZk7X-0007ap-Rq; Tue, 07 May 2013 15:48:03 +0000 Received: from mail-we0-f181.google.com ([74.125.82.181]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1UZk7G-0007VO-Hk for kernel-team@lists.ubuntu.com; Tue, 07 May 2013 15:47:46 +0000 Received: by mail-we0-f181.google.com with SMTP id q55so680720wes.12 for ; Tue, 07 May 2013 08:47:46 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state; bh=g9rbGfDHeO8k5+2pTNfsN5ntKeRdQ9LIkvNIn/9F2jc=; b=Imu5Nwfc3AqBWteujelpvp+OyHITknOyivZS98BuM7rp0HHKZbtpw/oDLXFQYEE8ho E4ET95SqClbbOgIGXAutNoxth2faTrWR21T9zBowwdDk2Twe3hAgwjt7zw3vbQVaVzAz ecGT2w59pJL7HbQQlUhnjY25aO8ytTBUsh2Va+mflbq9dAD71FU028I/B6FDLsZ8CU18 K8r/yvYaifT7h6R+J6R2daiAFPPOogjPqG6YNSbqbZdP5TMnSFTpwyvTnM95X1yIYNFM no5yVNHfwPCfo4M1zZRlUAKjeS6zz3quyOPBHslFeWAanZVQSYU05HNLmU2T52ePGz8c D6jA== X-Received: by 10.194.61.45 with SMTP id m13mr4488048wjr.20.1367941665109; Tue, 07 May 2013 08:47:45 -0700 (PDT) Received: from serenity.substantiel.local (mar92-17-78-228-214-160.fbx.proxad.net. [78.228.214.160]) by mx.google.com with ESMTPSA id q13sm3842742wie.8.2013.05.07.08.47.43 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 07 May 2013 08:47:43 -0700 (PDT) From: Anisse Astier To: linux-kbuild@vger.kernel.org Subject: [PATCH v4 3/4] deb-pkg: fix installed image path on parisc, mips and powerpc Date: Tue, 7 May 2013 17:46:50 +0200 Message-Id: <1367941611-12223-4-git-send-email-anisse@astier.eu> X-Mailer: git-send-email 1.8.3.rc1 In-Reply-To: <1367941611-12223-1-git-send-email-anisse@astier.eu> References: <1367941611-12223-1-git-send-email-anisse@astier.eu> X-Gm-Message-State: ALoCoQkv8RuYKgisEd6p2YqTTHp2ftOgOkpe+VlTXwz6AKiYNtkddQU5dPXC5NHIK4qOy9okpTf0 Cc: Michal Marek , maximilian attems , kernel-team@lists.ubuntu.com, Ben Hutchings , debian-kernel@lists.debian.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com Signed-off-by: Anisse Astier Reviewed-by: Ben Hutchings --- scripts/package/builddeb | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 797484b..73bb551 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -89,6 +89,18 @@ if [ "$ARCH" = "um" ] ; then packagename=user-mode-linux-$version fi +# Not all arches have the same installed path in debian +case $ARCH in +um) + installed_image_path="usr/bin/linux-$version" + ;; +parisc|mips|powerpc) + installed_image_path="boot/vmlinux-$version" + ;; +*) + installed_image_path="boot/vmlinuz-$version" +esac + BUILD_DEBUG="$(grep -s '^CONFIG_DEBUG_INFO=y' $objtree/$KCONFIG_CONFIG || true)" # Setup the directory structure @@ -116,16 +128,15 @@ if [ "$ARCH" = "um" ] ; then cp System.map "$tmpdir/usr/lib/uml/modules/$version/System.map" cp $KCONFIG_CONFIG "$tmpdir/usr/share/doc/$packagename/config" gzip "$tmpdir/usr/share/doc/$packagename/config" - cp $KBUILD_IMAGE "$tmpdir/usr/bin/linux-$version" else cp System.map "$tmpdir/boot/System.map-$version" cp $KCONFIG_CONFIG "$tmpdir/boot/config-$version" - # Not all arches include the boot path in KBUILD_IMAGE - if [ -e $KBUILD_IMAGE ]; then - cp $KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" - else - cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/boot/vmlinuz-$version" - fi +fi +# Not all arches include the boot path in KBUILD_IMAGE +if [ -e $KBUILD_IMAGE ]; then + cp $KBUILD_IMAGE "$tmpdir/$installed_image_path" +else + cp arch/$ARCH/boot/$KBUILD_IMAGE "$tmpdir/$installed_image_path" fi if grep -q '^CONFIG_MODULES=y' $objtree/$KCONFIG_CONFIG ; then