From patchwork Tue Feb 21 08:03:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 6855 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 3BC3D23F8D for ; Tue, 21 Feb 2012 08:03:17 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id D4F28A185DE for ; Tue, 21 Feb 2012 08:03:16 +0000 (UTC) Received: by iabz7 with SMTP id z7so12018346iab.11 for ; Tue, 21 Feb 2012 00:03:16 -0800 (PST) Received: from mr.google.com ([10.50.153.198]) by 10.50.153.198 with SMTP id vi6mr17722178igb.30.1329811396274 (num_hops = 1); Tue, 21 Feb 2012 00:03:16 -0800 (PST) Received: by 10.50.153.198 with SMTP id vi6mr14276417igb.30.1329811396219; Tue, 21 Feb 2012 00:03:16 -0800 (PST) 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.11.10 with SMTP id r10cs82655ibr; Tue, 21 Feb 2012 00:03:15 -0800 (PST) Received: by 10.180.78.6 with SMTP id x6mr20273834wiw.18.1329811393485; Tue, 21 Feb 2012 00:03:13 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id n9si17773619wed.22.2012.02.21.00.03.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 21 Feb 2012 00:03:13 -0800 (PST) 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 1Rzkgq-0007HI-9x for ; Tue, 21 Feb 2012 08:03:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 3F2E4E003A for ; Tue, 21 Feb 2012 08:03: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: 492 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 492: Fix the order of populate_raw_partition() arguments. Message-Id: <20120221080312.20853.34594.launchpad@ackee.canonical.com> Date: Tue, 21 Feb 2012 08:03: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="14838"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 514b098a31110e4a838fc18e2b2ad13cdbf5e48b X-Gm-Message-State: ALoCoQmJaGiFh2CBQI2HctdzFCvPwvMxopmVjMBiGBm4B3unwOI47hTyRppbgeYx9UJECTUjy1Fk Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/fix-raw-partition-arguments/+merge/93389 proposed by: Mattias Backman (mabac) review: Approve - Guilherme Salgado (salgado) ------------------------------------------------------------ revno: 492 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Tue 2012-02-21 08:57:57 +0100 message: Fix the order of populate_raw_partition() arguments. modified: linaro_image_tools/media_create/android_boards.py 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/android_boards.py' --- linaro_image_tools/media_create/android_boards.py 2012-02-20 18:32:21 +0000 +++ linaro_image_tools/media_create/android_boards.py 2012-02-21 07:57:57 +0000 @@ -165,7 +165,7 @@ @classmethod def populate_raw_partition(cls, media, boot_dir): - super(AndroidBoardConfig, cls).populate_raw_partition(boot_dir, media) + super(AndroidBoardConfig, cls).populate_raw_partition(media, boot_dir) @classmethod def install_boot_loader(cls, boot_partition, boot_device_or_file): === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2012-01-24 18:40:27 +0000 +++ linaro_image_tools/media_create/boards.py 2012-02-16 10:25:22 +0000 @@ -711,7 +711,7 @@ if (cls.snowball_startup_files_config is not None and cls.board != 'snowball_sd'): - cls.populate_raw_partition(chroot_dir, boot_device_or_file) + cls.populate_raw_partition(boot_device_or_file, chroot_dir) if cls.env_dd: # Do we need to zero out the env before flashing it? @@ -1070,10 +1070,10 @@ make_uImage(cls.load_addr, k_img_data, boot_dir) boot_script_path = os.path.join(boot_dir, cls.boot_script) make_boot_script(boot_env, boot_script_path) - cls.populate_raw_partition(chroot_dir, boot_device_or_file) + cls.populate_raw_partition(boot_device_or_file, chroot_dir) @classmethod - def populate_raw_partition(cls, chroot_dir, boot_device_or_file): + def populate_raw_partition(cls, boot_device_or_file, chroot_dir): # Populate created raw partition with TOC and startup files. config_files_path = os.path.join(chroot_dir, 'boot') _, toc_filename = tempfile.mkstemp() @@ -1398,7 +1398,7 @@ return uboot_file @classmethod - def populate_raw_partition(cls, chroot_dir, boot_device_or_file): + def populate_raw_partition(cls, boot_device_or_file, chroot_dir): # Zero the env so that the boot_script will get loaded _dd("/dev/zero", boot_device_or_file, count=cls.SAMSUNG_V310_ENV_LEN, seek=cls.SAMSUNG_V310_ENV_START)