From patchwork Wed Aug 31 13:38:12 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 3811 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 72D3A23F25 for ; Wed, 31 Aug 2011 13:38:14 +0000 (UTC) Received: from mail-ew0-f52.google.com (mail-ew0-f52.google.com [209.85.215.52]) by fiordland.canonical.com (Postfix) with ESMTP id 60920A189A4 for ; Wed, 31 Aug 2011 13:38:14 +0000 (UTC) Received: by mail-ew0-f52.google.com with SMTP id 28so527867ewy.11 for ; Wed, 31 Aug 2011 06:38:14 -0700 (PDT) Received: by 10.223.88.214 with SMTP id b22mr243141fam.5.1314797894104; Wed, 31 Aug 2011 06:38:14 -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.152.11.8 with SMTP id m8cs19054lab; Wed, 31 Aug 2011 06:38:13 -0700 (PDT) Received: by 10.227.60.84 with SMTP id o20mr379630wbh.98.1314797893108; Wed, 31 Aug 2011 06:38:13 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com [91.189.90.7]) by mx.google.com with ESMTPS id fo4si15989761wbb.2.2011.08.31.06.38.12 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 31 Aug 2011 06:38:13 -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 1Qykzc-00015W-Jx for ; Wed, 31 Aug 2011 13:38:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 8D339E01C5 for ; Wed, 31 Aug 2011 13:38:12 +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: 430 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 430: Look for Origen spl file origen-spl.bin since upstream changed the expected name. Message-Id: <20110831133812.23202.71537.launchpad@ackee.canonical.com> Date: Wed, 31 Aug 2011 13:38:12 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13827"; Instance="initZopeless config overlay" X-Launchpad-Hash: cfa416896686a521bae2238c244bc4f3bbdd665c Merge authors: Angus Ainslie (angus-akkea) Related merge proposals: https://code.launchpad.net/~linaro-landing-team-samsung/linaro-image-tools/new-origen-spl/+merge/73479 proposed by: Angus Ainslie (angus-akkea) review: Approve - Mattias Backman (mabac) ------------------------------------------------------------ revno: 430 [merge] committer: Mattias Backman branch nick: trunk timestamp: Wed 2011-08-31 15:35:02 +0200 message: Look for Origen spl file origen-spl.bin since upstream changed the expected name. 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 2011-08-30 08:52:00 +0000 +++ linaro_image_tools/media_create/boards.py 2011-08-31 13:35:02 +0000 @@ -1182,12 +1182,17 @@ chroot_dir, 'usr', 'lib', 'u-boot', cls.uboot_flavor) old_spl_path = os.path.join(spl_dir, 'v310_mmc_spl.bin') new_spl_path = os.path.join(spl_dir, 'u-boot-mmc-spl.bin') + new_new_spl_path = os.path.join(spl_dir, 'origen-spl.bin') spl_file = old_spl_path # The new upstream u-boot filename has changed if not os.path.exists(spl_file): spl_file = new_spl_path + # The new upstream u-boot filename has changed again + if not os.path.exists(spl_file): + spl_file = new_new_spl_path + if not os.path.exists(spl_file): # missing SPL loader raise AssertionError("Couldn't find the SPL file, tried %s and %s"