From patchwork Thu Sep 19 15:10:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fathi Boudra X-Patchwork-Id: 20451 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vc0-f197.google.com (mail-vc0-f197.google.com [209.85.220.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1CA0F246E9 for ; Thu, 19 Sep 2013 15:10:40 +0000 (UTC) Received: by mail-vc0-f197.google.com with SMTP id gd11sf8760633vcb.8 for ; Thu, 19 Sep 2013 08:10:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:mime-version:to:from:subject :message-id:date:reply-to:sender:errors-to:precedence :x-original-sender:x-original-authentication-results:mailing-list :list-id:list-post:list-help:list-archive:list-unsubscribe :content-type; bh=0KeZ1L4TVienb6dBZp1M+8SjdxJvMkQpCAv+exp6dSM=; b=Uc0I47pwdu49nRqOSRoa7PDrS8AJKAKQOk7z6SwY7zidNG8dx6+WDjZ5BM+cpYh3Xh zYmS20FubNDxZNsIYY6MrbvPUPNs4+hQwgBHFlR2lKXYWCCbXICrh8z3tqvdgRF+Gkbc ejHs1VKKlUf2cuqIV29T7mYWbKyso4YTR5emctNG8ZJDyr5DnvlEbdI+Hi8ZYur6pHXL H3G1/jStLDXH1VOy08PFcl/ZSsmtSDnkGm9DjSZTAZgrFIqD2Cdi7XbKQ2xz7lZRnqKY Ku3xD6lEqCXMcu+HqEMTqTqSaZ1ffKB0dOFzxvmJKv/cPZ8/3nIZnUqYKDSJC+e+ApYY jlfg== X-Gm-Message-State: ALoCoQkzaqk8sQl0ROcaXF0fX/i6lrI3+A275vtVLvvZ8TWM/14zqXsoI4A5QDgoO8P16tSFasNf X-Received: by 10.236.174.232 with SMTP id x68mr823605yhl.42.1379603439967; Thu, 19 Sep 2013 08:10:39 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.38.70 with SMTP id e6ls4005480qek.77.gmail; Thu, 19 Sep 2013 08:10:39 -0700 (PDT) X-Received: by 10.52.74.100 with SMTP id s4mr501701vdv.35.1379603439855; Thu, 19 Sep 2013 08:10:39 -0700 (PDT) Received: from mail-vc0-f171.google.com (mail-vc0-f171.google.com [209.85.220.171]) by mx.google.com with ESMTPS id y4si1925837vcx.24.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 19 Sep 2013 08:10:39 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.171; Received: by mail-vc0-f171.google.com with SMTP id ij15so6585261vcb.16 for ; Thu, 19 Sep 2013 08:10:39 -0700 (PDT) X-Received: by 10.220.144.68 with SMTP id y4mr602599vcu.28.1379603439765; Thu, 19 Sep 2013 08:10:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp283306vcz; Thu, 19 Sep 2013 08:10:39 -0700 (PDT) X-Received: by 10.236.153.169 with SMTP id f29mr1067035yhk.82.1379603438809; Thu, 19 Sep 2013 08:10:38 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o3si3831819qat.171.1969.12.31.16.00.00 (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 19 Sep 2013 08:10:38 -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; Received: from ackee.canonical.com ([91.189.89.26]) by indium.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1VMfsL-0004Qg-HG for ; Thu, 19 Sep 2013 15:10:37 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 71346E07C1 for ; Thu, 19 Sep 2013 15:10:37 +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: 641 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 641: Add support for the new ARM models Message-Id: <20130919151037.20185.92377.launchpad@ackee.canonical.com> Date: Thu, 19 Sep 2013 15:10:37 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: list X-Generated-By: Launchpad (canonical.com); Revision="16765"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5986680cc29c276b0d903bb6551084d599661e00 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: noreply@launchpad.net X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.171 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Merge authors: Fathi Boudra (fboudra) Related merge proposals: https://code.launchpad.net/~fboudra/linaro-image-tools/new-models/+merge/186556 proposed by: Fathi Boudra (fboudra) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 641 [merge] committer: Fathi Boudra branch nick: linaro-image-tools timestamp: Thu 2013-09-19 18:09:20 +0300 message: Add support for the new ARM models modified: linaro-hwpack-install 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-hwpack-install' --- linaro-hwpack-install 2013-08-19 07:39:34 +0000 +++ linaro-hwpack-install 2013-09-19 14:15:46 +0000 @@ -274,6 +274,16 @@ dpkg-deb -x ${pkg} $ROOTFS_DIR done + ls ${HWPACK_DIR}/pkgs/*-pre-boot_*.deb | while read pkg; do + echo "Extracting package `basename $pkg`" + dpkg-deb -x ${pkg} $ROOTFS_DIR + done + + ls ${HWPACK_DIR}/pkgs/uefi-image-*.deb | while read pkg; do + echo "Extracting package `basename $pkg`" + dpkg-deb -x ${pkg} $ROOTFS_DIR + done + # manually generate modules.dep ls $ROOTFS_DIR/lib/modules | while read kernel; do depmod -b $ROOTFS_DIR ${kernel} || true === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2013-08-16 08:01:22 +0000 +++ linaro_image_tools/media_create/boards.py 2013-09-19 14:15:46 +0000 @@ -1435,8 +1435,9 @@ bw_foundation = _get_file_matching("%s/boot/img-foundation.axf" % chroot_dir) - for filename in (bw_ve, bw_foundation, k_img_data, - i_img_data, d_img_data): + files = [bw_ve, bw_foundation, k_img_data, i_img_data, d_img_data] + files.extend(glob.glob("%s/fvp/*.bin" % boot_dir)) + for filename in files: if filename is not None: copy_drop(filename, output_dir) cmd_runner.run(["cp", "-v", filename, boot_dir], @@ -1891,7 +1892,7 @@ elif len(files) == 0: return None else: - # TODO: Could ask the user to chosse which file to use instead of + # TODO: Could ask the user to choose which file to use instead of # raising an exception. raise ValueError("Too many files matching '%s' found." % regex)