From patchwork Thu May 24 10:51:17 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?0JTQsNC90LjQu9C+INCo0LXQs9Cw0L0=?= X-Patchwork-Id: 8943 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 4BE1123F0A for ; Thu, 24 May 2012 10:51:21 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 075E7A18467 for ; Thu, 24 May 2012 10:51:20 +0000 (UTC) Received: by yhpp61 with SMTP id p61so9223008yhp.11 for ; Thu, 24 May 2012 03:51:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :content-type:mime-version:x-launchpad-project:x-launchpad-branch :x-launchpad-message-rationale:x-launchpad-branch-revision-number :x-launchpad-notification-type:to:from:subject:message-id:date :reply-to:sender:errors-to:precedence:x-generated-by :x-launchpad-hash:x-gm-message-state; bh=B2xCkn4nrkq7px0wkX0y0qaIkSG5pYfIszIeLV+DRwg=; b=fX5Oi5JCdzItGgRGWIl1eSLXWdAyBHF+J4rm6VYjcuzwphmiTzc/Qg9GwNSeSvS/aj UCf41abKf7pW9DZvVWh1dvHthkbcZMBmzHbcQ/douj6jd0vgPFeI+OjXatp+hlacKG9b /f86tDoBAbwS7qYf2wWTBr3FOyeNaGDEPVHWQw/izOo0rOMTVr+NpO4YrU4tkyLRtkDI 8Xzf8GF1ySt6cIIbfeiVF9ZBZLhbCqE28iCR2hHU9vxrRpGgJzgvJJSvofyV1vfY+WEX 7+MeJMZ6/ONeWBnrNYWxJJuqMU0fcsIdpphNpoDkR1a9BMXmrqN9t82zy2EvS6Qg8zjD WqSQ== Received: by 10.42.56.80 with SMTP id y16mr10706397icg.48.1337856680165; Thu, 24 May 2012 03:51:20 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.231.35.72 with SMTP id o8csp30122ibd; Thu, 24 May 2012 03:51:19 -0700 (PDT) Received: by 10.180.93.196 with SMTP id cw4mr36038705wib.11.1337856678964; Thu, 24 May 2012 03:51:18 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id w63si12569479wel.94.2012.05.24.03.51.18 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 24 May 2012 03:51:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) client-ip=91.189.90.7; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.7 as permitted sender) smtp.mail=bounces@canonical.com Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1SXVdW-0001Xd-1C for ; Thu, 24 May 2012 10:51:18 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 0058FE03AD for ; Thu, 24 May 2012 10:51:18 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-image-tools/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 519 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 519: Do not require all of .axf file, zimage and dtb if they are not really needed for FastModel. Patc... Message-Id: <20120524105117.9241.92629.launchpad@ackee.canonical.com> Date: Thu, 24 May 2012 10:51:17 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="15288"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 0433ab316ba79a7d8b0c1f09b1d3da9ae1db658b X-Gm-Message-State: ALoCoQkx4Xq+plDF8YmyBojshwbamtaE+SqqxEtwD7p3fn3ceQHyFxweYyGoZ0wR0ARDKx5hENUe Merge authors: Riku Voipio (riku-voipio) Related merge proposals: https://code.launchpad.net/~riku-voipio/linaro-image-tools/linaro-image-tools/+merge/106591 proposed by: Riku Voipio (riku-voipio) review: Approve - Данило Шеган (danilo) ------------------------------------------------------------ revno: 519 [merge] committer: Danilo Segan branch nick: trunk timestamp: Thu 2012-05-24 12:49:32 +0200 message: Do not require all of .axf file, zimage and dtb if they are not really needed for FastModel. Patch by Riku Voipio. modified: linaro_image_tools/media_create/boards.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk You are subscribed to branch lp:linaro-image-tools. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-image-tools/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2012-05-16 07:17:13 +0000 +++ linaro_image_tools/media_create/boards.py 2012-05-17 12:15:15 +0000 @@ -1368,10 +1368,11 @@ d_img_data): output_dir=os.path.dirname(boot_device_or_file) - copy_drop(_get_file_matching("%s/boot/img.axf" % chroot_dir), output_dir) + bootwrapper=_get_file_matching("%s/boot/img.axf" % chroot_dir) - for filename in (k_img_data, i_img_data, d_img_data): - copy_drop(filename, output_dir) + for filename in (bootwrapper, k_img_data, i_img_data, d_img_data): + if filename != None: + copy_drop(filename, output_dir) class SamsungConfig(BoardConfig): @classproperty