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: 2535991 Return-Path: X-Original-To: patchwork-linux-kbuild@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 77AD5DF215 for ; Tue, 7 May 2013 15:47:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757756Ab3EGPrs (ORCPT ); Tue, 7 May 2013 11:47:48 -0400 Received: from mail-we0-f181.google.com ([74.125.82.181]:45987 "EHLO mail-we0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757712Ab3EGPrr (ORCPT ); Tue, 7 May 2013 11:47:47 -0400 Received: by mail-we0-f181.google.com with SMTP id q55so688437wes.40 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=HDmnjodo4x5sGzzVRAviOITYZHhzQiL+ZI0WpMzcgjy+NvSGIXImoK+3QNTDiCwUyY Zv1JRdZ2ggj78bdxJDFkQGDQdspP9fH3D7dbX6Lf2G43ljsMEe63q1nQQSOs1eO8iCn/ PdefwpfzNl+YuFJj/qywIJT2LAWjsZ4rd1JmYZ1gkt2yebLfArtGWTGxASHIQrAjMQOg QEA5MP/rt86P5xFdOMGXIf+CWPWF0GC+Ub6KDcYx2o7Pt9Me7P1yt+zWCdMPmeLaTp+V 1dQiLU7G4URZHR6SgpWVE8xWv3RmuCznl02Gg/+uo+ufxyqhIBvRoUETA8hXkXQBOFoi K6lQ== 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 Cc: Michal Marek , maximilian attems , Anisse Astier , Ben Hutchings , debian-kernel@lists.debian.org, kernel-team@lists.ubuntu.com 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: ALoCoQkQroVqotDGXw4bRUJoL2PJSO6clQcV1mOFuCV33saaMX4O4RMDR8Ho0UEsz7u+uTuFp8rS Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org 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