From patchwork Tue Aug 28 10:48:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Sokolovsky X-Patchwork-Id: 10999 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 8A35123E29 for ; Tue, 28 Aug 2012 10:48:15 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 2B2A9A18FF3 for ; Tue, 28 Aug 2012 10:47:46 +0000 (UTC) Received: by ieak11 with SMTP id k11so43770iea.11 for ; Tue, 28 Aug 2012 03:48:14 -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=ZB/7mErHps5q0oSla1l9J4wS1cfllxCV91IF5528Z8I=; b=dpqOywtmG88AzlcbQJiC4xE2qaGzx7T/lwt1m95C2Tjm1k8vAZu+yHrByLCOQLE5yb oBtlc+mgLKPRRepJeOOHErkt0LRCLysTeG3bmGVzfi/PPOcgyFMzH04I1gYQ4PSbY4y2 7xitOZM2aXKm6CDAHrJWWU8wmgjBbmB67f819oQOP51+SBvBIWLfCxO0xaR1T3VDU97s 4ZemAMoXL0mLYPqEpV38TyZO7CkGzzUUPN69eBrhDBIORG5Q4tXJZRe7N53ZMeON33g4 LgI/A0nMUWIce1gHD7znWpcDZhJ1h3+Yb0Fl66+c1TWlshhu6uLN68bkOCtyZGkZ3Vzq ZxWg== Received: by 10.42.109.194 with SMTP id m2mr13290859icp.48.1346150894560; Tue, 28 Aug 2012 03:48: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.50.184.232 with SMTP id ex8csp19106igc; Tue, 28 Aug 2012 03:48:13 -0700 (PDT) Received: by 10.216.121.16 with SMTP id q16mr7852040weh.193.1346150893136; Tue, 28 Aug 2012 03:48:13 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id he8si5537234wib.25.2012.08.28.03.48.12 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 28 Aug 2012 03:48:13 -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 1T6JLA-00049I-Cp for ; Tue, 28 Aug 2012 10:48:12 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 55EFBE4D65 for ; Tue, 28 Aug 2012 10:48: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: 551 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 551: Add basic definition and property accessor for "copy_files" field. Message-Id: <20120828104812.4135.46040.launchpad@ackee.canonical.com> Date: Tue, 28 Aug 2012 10:48: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="15864"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: e66b3e357eb09e32b214d3a3f31978774dc7c59a X-Gm-Message-State: ALoCoQn2HWNXQkUXOlscJsnrfMB3Nukfq2nQ7ZpvUjwDlMslHocN7nE/acHsjDfZV4yBYPCubsiw Merge authors: Paul Sokolovsky (pfalcon) Related merge proposals: https://code.launchpad.net/~pfalcon/linaro-image-tools/copy_files_field/+merge/121540 proposed by: Paul Sokolovsky (pfalcon) review: Approve - James Tunnicliffe (dooferlad) review: Approve - Milo Casagrande (milo) ------------------------------------------------------------ revno: 551 [merge] committer: Paul Sokolovsky branch nick: trunk timestamp: Tue 2012-08-28 13:44:33 +0300 message: Add basic definition and property accessor for "copy_files" field. modified: linaro_image_tools/hwpack/config.py linaro_image_tools/hwpack/hwpack_fields.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/hwpack/config.py' --- linaro_image_tools/hwpack/config.py 2012-07-31 10:36:49 +0000 +++ linaro_image_tools/hwpack/config.py 2012-08-28 06:02:43 +0000 @@ -39,6 +39,7 @@ BOOTLOADERS_FIELD, BOOT_MIN_SIZE_FIELD, BOOT_SCRIPT_FIELD, + COPY_FILES_FIELD, DD_FIELD, DTB_ADDR_FIELD, DTB_FILE_FIELD, @@ -307,6 +308,11 @@ return self._get_bootloader_option(SPL_IN_BOOT_PART_FIELD) @property + def boot_copy_files(self): + """Extra files to copy to boot partition.""" + return self._get_bootloader_option(COPY_FILES_FIELD) + + @property def spl_dd(self): """If the spl binary should be dd:d to the boot partition this field specifies the offset. An int.""" === modified file 'linaro_image_tools/hwpack/hwpack_fields.py' --- linaro_image_tools/hwpack/hwpack_fields.py 2012-07-31 10:36:49 +0000 +++ linaro_image_tools/hwpack/hwpack_fields.py 2012-08-28 06:02:43 +0000 @@ -60,6 +60,7 @@ VERSION_FIELD = 'version' # Bootloaders specific fields +COPY_FILES_FIELD = 'copy_files' DD_FIELD = 'dd' ENV_DD_FIELD = 'env_dd' EXTRA_BOOT_OPTIONS_FIELD = 'extra_boot_options' @@ -138,6 +139,7 @@ PACKAGE_FIELD: None, FILE_FIELD: None, IN_BOOT_PART_FIELD: None, + COPY_FILES_FIELD: None, DD_FIELD: None, EXTRA_BOOT_OPTIONS_FIELD: None, SPL_PACKAGE_FIELD: None,