From patchwork Thu Sep 22 20:44:13 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 4281 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 D566823EFD for ; Thu, 22 Sep 2011 20:44:14 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id C0A60A18521 for ; Thu, 22 Sep 2011 20:44:14 +0000 (UTC) Received: by fxe23 with SMTP id 23so4416877fxe.11 for ; Thu, 22 Sep 2011 13:44:14 -0700 (PDT) Received: by 10.223.63.8 with SMTP id z8mr3652938fah.84.1316724254581; Thu, 22 Sep 2011 13:44: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.18.198 with SMTP id y6cs183615lad; Thu, 22 Sep 2011 13:44:14 -0700 (PDT) Received: by 10.216.169.203 with SMTP id n53mr4111269wel.70.1316724254055; Thu, 22 Sep 2011 13:44:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id o41si8209065weq.53.2011.09.22.13.44.13 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 22 Sep 2011 13:44:14 -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 1R6q7x-0001GS-Gq for ; Thu, 22 Sep 2011 20:44:13 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 6F440E0648 for ; Thu, 22 Sep 2011 20:44:13 +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: 435 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 435: Allow --dev snowball_sd with V2 hwpacks. Message-Id: <20110922204413.11961.35810.launchpad@ackee.canonical.com> Date: Thu, 22 Sep 2011 20:44:13 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="13996"; Instance="initZopeless config overlay" X-Launchpad-Hash: f13b6c86bf4aecead80553e82a6c7429e5375dc0 Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/snowball-sd-v2/+merge/76646 proposed by: Mattias Backman (mabac) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 435 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Thu 2011-09-22 22:42:03 +0200 message: Allow --dev snowball_sd with V2 hwpacks. modified: linaro-media-create 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-media-create' --- linaro-media-create 2011-09-15 11:45:23 +0000 +++ linaro-media-create 2011-09-22 20:11:46 +0000 @@ -113,6 +113,7 @@ board_config = board_configs[args.board] board_config.set_metadata(args.hwpacks) + board_config.set_board(args.board) ensure_required_commands(args) === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2011-09-22 12:23:46 +0000 +++ linaro_image_tools/media_create/boards.py 2011-09-22 20:11:46 +0000 @@ -191,6 +191,7 @@ class BoardConfig(object): + board = None """The configuration used when building an image for a board.""" hwpack_format = None # These attributes may not need to be redefined on some subclasses. @@ -274,6 +275,10 @@ return data @classmethod + def set_board(cls, board): + cls.board = board + + @classmethod def set_metadata(cls, hwpacks): cls.hardwarepack_handler = HardwarepackHandler(hwpacks) with cls.hardwarepack_handler: @@ -526,7 +531,8 @@ @classmethod def get_sfdisk_cmd(cls, should_align_boot_part=False): - if cls.partition_layout in ['bootfs_rootfs', 'bootfs16_rootfs']: + if (cls.partition_layout in ['bootfs_rootfs', 'bootfs16_rootfs'] or + cls.board == 'snowball_sd'): return cls.get_normal_sfdisk_cmd(should_align_boot_part) elif cls.partition_layout in ['reserved_bootfs_rootfs']: return cls.get_reserved_sfdisk_cmd(should_align_boot_part) @@ -681,8 +687,8 @@ # Only used for Omap and Igep, will this be bad for the other boards? make_boot_ini(boot_script_path, boot_dir) - if cls.snowball_startup_files_config is not None: - # This should only happen for --dev snowball_emmc!!! + if (cls.snowball_startup_files_config is not None and + cls.board != 'snowball_sd'): cls.populate_raw_partition(chroot_dir, boot_device_or_file) if cls.env_dd: