From patchwork Thu Oct 6 09:17:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mattias Backman X-Patchwork-Id: 4546 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 7D5F423E51 for ; Thu, 6 Oct 2011 09:17:16 +0000 (UTC) Received: from mail-ey0-f180.google.com (mail-ey0-f180.google.com [209.85.215.180]) by fiordland.canonical.com (Postfix) with ESMTP id 69304A18CD7 for ; Thu, 6 Oct 2011 09:17:16 +0000 (UTC) Received: by eyb6 with SMTP id 6so3387920eyb.11 for ; Thu, 06 Oct 2011 02:17:16 -0700 (PDT) Received: by 10.223.92.152 with SMTP id r24mr2358342fam.19.1317892636187; Thu, 06 Oct 2011 02:17:16 -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.23.170 with SMTP id n10cs121842laf; Thu, 6 Oct 2011 02:17:15 -0700 (PDT) Received: by 10.213.9.134 with SMTP id l6mr432424ebl.96.1317892634870; Thu, 06 Oct 2011 02:17:14 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id m36si3459381weq.117.2011.10.06.02.17.14 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 06 Oct 2011 02:17: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 1RBk4o-0006rG-AU for ; Thu, 06 Oct 2011 09:17:14 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 46A15E04EB for ; Thu, 6 Oct 2011 09:17:14 +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: 443 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-image-tools/linaro-image-tools/trunk] Rev 443: Make the boot_script hwpack field optional. Message-Id: <20111006091714.29115.67334.launchpad@ackee.canonical.com> Date: Thu, 06 Oct 2011 09:17:14 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="14085"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 5f3c64d67ef37c963c397b9f974c2cdb8017342b Merge authors: Mattias Backman (mabac) Related merge proposals: https://code.launchpad.net/~mabac/linaro-image-tools/bug-860225/+merge/77104 proposed by: Mattias Backman (mabac) review: Approve - James Westby (james-w) ------------------------------------------------------------ revno: 443 [merge] committer: Mattias Backman branch nick: linaro-image-tools timestamp: Thu 2011-10-06 11:15:07 +0200 message: Make the boot_script hwpack field optional. modified: linaro_image_tools/hwpack/config.py linaro_image_tools/hwpack/tests/test_config.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/hwpack/config.py' --- linaro_image_tools/hwpack/config.py 2011-09-22 12:23:46 +0000 +++ linaro_image_tools/hwpack/config.py 2011-09-27 07:06:09 +0000 @@ -602,9 +602,7 @@ def _validate_boot_script(self): boot_script = self.boot_script if not boot_script: - raise HwpackConfigError( - "No boot_script in the [%s] section" % \ - self.MAIN_SECTION) + return else: self._assert_matches_pattern( self.PATH_REGEX, boot_script, "Invalid path: %s" % boot_script) === modified file 'linaro_image_tools/hwpack/tests/test_config.py' --- linaro_image_tools/hwpack/tests/test_config.py 2011-09-21 13:13:59 +0000 +++ linaro_image_tools/hwpack/tests/test_config.py 2011-09-27 07:06:09 +0000 @@ -242,16 +242,6 @@ "initrd_file = \n") self.assertValidationError("No initrd_file in the [hwpack] section", config) - def test_validate_empty_boot_script(self): - config = self.get_config(self.valid_start_v2 + - "u-boot-package = u-boot-linaro-s5pv310\n" \ - "u-boot-file = u-boot.bin\n" - "partition_layout = bootfs_rootfs\n"\ - "kernel_file = boot/vmlinuz-3.0.0-1002-linaro-omap\n"\ - "mmc_id = 0:1\n"\ - "initrd_file = boot/initrd.img-3.0.0-1002-linaro-omap\n") - self.assertValidationError("No boot_script in the [hwpack] section", config) - def test_validate_invalid_boot_script(self): config = self.get_config(self.valid_start_v2 + "u-boot-package = u-boot-linaro-s5pv310\n" \ === modified file 'linaro_image_tools/media_create/boards.py' --- linaro_image_tools/media_create/boards.py 2011-10-04 15:21:57 +0000 +++ linaro_image_tools/media_create/boards.py 2011-10-06 09:15:07 +0000 @@ -684,8 +684,8 @@ boot_script_path = os.path.join(boot_dir, cls.boot_script) make_boot_script(boot_env, boot_script_path) - # Only used for Omap and Igep, will this be bad for the other boards? - make_boot_ini(boot_script_path, boot_dir) + # Only used for Omap, 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 and cls.board != 'snowball_sd'):