From patchwork Mon May 14 12:30: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: 8592 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 EC5B823E1B for ; Mon, 14 May 2012 12:30:20 +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 8A59EA180DC for ; Mon, 14 May 2012 12:30:20 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so5244392yhp.11 for ; Mon, 14 May 2012 05:30: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=BRJjPnFvIBzJHJZisJbLWSprWKUaIjONkfg0vrkC5hM=; b=Omw5UDMPwjBxG0vPyCTfCxxqjitYUQJAYVQGhQ0hkVhmq6YpzmmbZwhM9yXFGmHjxP x2ERufVeifg104ROItp/WEftTefgaWD/kvNH3r/OWxlPqe6cd40yi1AA4HxqRsdnJKYp xE29AwQGF5v2F5geGvyvsE49TLLBRNtd4HP7MRZyiQCEjZICfPJ2STLrhxGFNMaeJ8b+ wj5LPOiPudEdIipnYYKZfada9YsgGCiomaZvrniq8cgu1cN6QPCSdD+Z0fJBss6Q7Qkt Lmmzq98u055pg9cC5yw0aLFvvyyIUQ5OjsnxpgjFtfmpmumdOgcC6aWurBarOJpxERgH o5OA== Received: by 10.42.119.129 with SMTP id b1mr3548004icr.48.1336998620109; Mon, 14 May 2012 05:30: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 o8csp339203ibd; Mon, 14 May 2012 05:30:19 -0700 (PDT) Received: by 10.180.78.164 with SMTP id c4mr19676278wix.10.1336998617946; Mon, 14 May 2012 05:30:17 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id g9si12615127wee.68.2012.05.14.05.30.17 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 14 May 2012 05:30:17 -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 1STuPp-0000C0-96 for ; Mon, 14 May 2012 12:30:17 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 3B3F4E1A8B for ; Mon, 14 May 2012 12:30:17 +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: 515 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 515: Implement hwpack v2 support for i386 boards. Fixes #997147. Patch contributed by Luis Araujo. Message-Id: <20120514123017.18968.23872.launchpad@ackee.canonical.com> Date: Mon, 14 May 2012 12:30: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="15238"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 22e62d867752071915146e85955e32b891bd121d X-Gm-Message-State: ALoCoQnOIy3d/m6Vxkhdl4hkUcazqBhRoMLwq2eHBHwhOtA45169xG007rejkFRO0FxiZrPNhgmR Merge authors: Luis Araujo (luis-araujo) Related merge proposals: https://code.launchpad.net/~luis-araujo/linaro-image-tools/hwpackv2-i386/+merge/103198 proposed by: Luis Araujo (luis-araujo) review: Approve - Данило Шеган (danilo) ------------------------------------------------------------ revno: 515 [merge] committer: Danilo Šegan branch nick: trunk timestamp: Mon 2012-05-14 14:26:09 +0200 message: Implement hwpack v2 support for i386 boards. Fixes #997147. Patch contributed by Luis Araujo. 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-04-19 01:12:10 +0000 +++ linaro_image_tools/media_create/boards.py 2012-04-24 00:14:34 +0000 @@ -1510,7 +1510,7 @@ _live_serial_opts = 'serialtty=%s' # define kernel image - kernel_flavors = ['generic'] + kernel_flavors = ['generic', 'pae'] # define bootloader BOOTLOADER_CMD = 'grub-install' @@ -1535,9 +1535,6 @@ def _make_boot_files(cls, boot_env, chroot_dir, boot_dir, boot_device_or_file, k_img_data, i_img_data, d_img_data): - # XXX: delete this method when hwpacks V1 can die - assert cls.hwpack_format == HardwarepackHandler.FORMAT_1 - # copy image and init into boot partition cmd_runner.run(['cp', k_img_data, boot_dir], as_root=True).wait() cmd_runner.run(['cp', i_img_data, boot_dir], as_root=True).wait() @@ -1564,6 +1561,15 @@ cmd_runner.run(['cp', tmpfile, os.path.join(boot_dir, cls.BOOTLOADER_CFG_FILE)], as_root=True).wait() + @classmethod + def _make_boot_files_v2(cls, boot_env, chroot_dir, boot_dir, + boot_device_or_file, k_img_data, i_img_data, + d_img_data): + # reuse hwpack v1 function + cls._make_boot_files(boot_env, chroot_dir, boot_dir, + boot_device_or_file, k_img_data, i_img_data, + d_img_data) + board_configs = { 'beagle': BeagleConfig,