From patchwork Fri Apr 1 14:21:19 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Lo=C3=AFc_Minier?= X-Patchwork-Id: 881 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:46:56 -0000 Delivered-To: patches@linaro.org Received: by 10.42.161.68 with SMTP id s4cs219684icx; Fri, 1 Apr 2011 07:21:22 -0700 (PDT) Received: by 10.216.232.8 with SMTP id m8mr915438weq.22.1301667681412; Fri, 01 Apr 2011 07:21:21 -0700 (PDT) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id k26si4608864wej.154.2011.04.01.07.21.20; Fri, 01 Apr 2011 07:21:21 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Q5fE0-000382-8g for ; Fri, 01 Apr 2011 14:21:20 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id E07292E800B for ; Fri, 1 Apr 2011 14:21:19 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 308 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 308: Merge lp:~lag/linaro-image-tools/lt-ux500-support but change glob from "u*500" Message-Id: <20110401142119.20723.82312.launchpad@loganberry.canonical.com> Date: Fri, 01 Apr 2011 14:21:19 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12710"; Instance="initZopeless config overlay" X-Launchpad-Hash: ebb2052647d55226fbdc78c210f804b56474d237 Merge authors: Lee Jones (lag) Related merge proposals: https://code.launchpad.net/~lag/linaro-image-tools/lt-ux500-support/+merge/53970 proposed by: Lee Jones (lag) review: Needs Fixing - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 308 [merge] fixes bug(s): https://launchpad.net/bugs/737173 committer: Loïc Minier branch nick: linaro-image-tools timestamp: Fri 2011-04-01 16:18:41 +0200 message: Merge lp:~lag/linaro-image-tools/lt-ux500-support but change glob from "u*500" to "u?500"; fixes support for new name of vmlinuz file in U8500 hwpack; LP: #737173. modified: linaro_image_tools/media_create/boards.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-maintainers/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-maintainers/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2011-03-28 20:21:09 +0000 +++ linaro_image_tools/media_create/boards.py 2011-04-01 14:18:41 +0000 @@ -429,7 +429,7 @@ kernel_addr = '0x00100000' initrd_addr = '0x08000000' load_addr = '0x00008000' - kernel_suffix = 'ux500' + kernel_suffix = 'u?500' boot_script = 'flash.scr' extra_boot_args_options = ( 'earlyprintk rootdelay=1 fixrtc nocompcache '