From patchwork Tue Mar 1 16:27:30 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Guilherme Salgado X-Patchwork-Id: 271 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:41:21 -0000 Delivered-To: patches@linaro.org Received: by 10.224.19.208 with SMTP id c16cs147942qab; Tue, 1 Mar 2011 08:27:31 -0800 (PST) Received: by 10.227.39.5 with SMTP id d5mr5451426wbe.17.1298996851291; Tue, 01 Mar 2011 08:27:31 -0800 (PST) Received: from adelie.canonical.com (adelie.canonical.com [91.189.90.139]) by mx.google.com with ESMTP id s1si3275541wbs.33.2011.03.01.08.27.30; Tue, 01 Mar 2011 08:27:31 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) client-ip=91.189.90.139; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of bounces@canonical.com designates 91.189.90.139 as permitted sender) smtp.mail=bounces@canonical.com Received: from loganberry.canonical.com ([91.189.90.37]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1PuSQ6-0005eM-Ru for ; Tue, 01 Mar 2011 16:27:30 +0000 Received: from loganberry.canonical.com (localhost [127.0.0.1]) by loganberry.canonical.com (Postfix) with ESMTP id D1EEF2E82BA for ; Tue, 1 Mar 2011 16:27:30 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: linaro-image-tools X-Launchpad-Branch: ~linaro-maintainers/linaro-image-tools/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 291 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-maintainers/linaro-image-tools/trunk] Rev 291: l-m-c now stores the original boot script (before we feed it to mkimage) in the boot partition as... Message-Id: <20110301162730.9480.47376.launchpad@loganberry.canonical.com> Date: Tue, 01 Mar 2011 16:27:30 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="12460"; Instance="initZopeless config overlay" X-Launchpad-Hash: ece973beb6a893cddd93df0982586a39c741cedc Merge authors: Guilherme Salgado (salgado) Related merge proposals: https://code.launchpad.net/~salgado/linaro-image-tools/save-plain-boot-script/+merge/51574 proposed by: Guilherme Salgado (salgado) review: Approve - Loïc Minier (lool) review: Abstain - James Westby (james-w) ------------------------------------------------------------ revno: 291 [merge] committer: Guilherme Salgado branch nick: trunk timestamp: Tue 2011-03-01 13:23:52 -0300 message: l-m-c now stores the original boot script (before we feed it to mkimage) in the boot partition as boot.txt modified: linaro_media_create/boards.py linaro_media_create/tests/test_media_create.py --- lp:linaro-image-tools https://code.launchpad.net/~linaro-maintainers/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-maintainers/linaro-image-tools/trunk/+edit-subscription === modified file 'linaro_media_create/boards.py' --- linaro_media_create/boards.py 2011-02-25 13:19:31 +0000 +++ linaro_media_create/boards.py 2011-03-01 16:23:52 +0000 @@ -24,11 +24,9 @@ board_configs at the bottom of this file. """ -import atexit import glob import os import re -import tempfile from linaro_media_create import cmd_runner from linaro_media_create.partitions import SECTOR_SIZE @@ -498,12 +496,12 @@ def make_boot_script(boot_script_data, boot_script): # Need to save the boot script data into a file that will be passed to # mkimage. - _, tmpfile = tempfile.mkstemp() - atexit.register(os.unlink, tmpfile) - with open(tmpfile, 'w') as fd: + plain_boot_script = os.path.join( + os.path.dirname(boot_script), 'boot.txt') + with open(plain_boot_script, 'w') as fd: fd.write(boot_script_data) return _run_mkimage( - 'script', '0', '0', 'boot script', tmpfile, boot_script) + 'script', '0', '0', 'boot script', plain_boot_script, boot_script) def install_mx5_boot_loader(imx_file, boot_device_or_file): === modified file 'linaro_media_create/tests/test_media_create.py' --- linaro_media_create/tests/test_media_create.py 2011-02-25 13:19:31 +0000 +++ linaro_media_create/tests/test_media_create.py 2011-03-01 16:23:52 +0000 @@ -606,15 +606,16 @@ self.assertEqual(expected, fixture.mock.calls) def test_make_boot_script(self): - self.useFixture(MockSomethingFixture( - tempfile, 'mkstemp', lambda: (-1, '/tmp/random-abxzr'))) + tempdir = self.useFixture(CreateTempDirFixture()).tempdir self._mock_get_file_matching() fixture = self._mock_Popen() - make_boot_script('boot script data', 'boot_script') + boot_script_path = os.path.join(tempdir, 'boot.scr') + plain_boot_script_path = os.path.join(tempdir, 'boot.txt') + make_boot_script('boot script data', boot_script_path) expected = [ 'sudo', 'mkimage', '-A', 'arm', '-O', 'linux', '-T', 'script', '-C', 'none', '-a', '0', '-e', '0', '-n', 'boot script', - '-d', '/tmp/random-abxzr', 'boot_script'] + '-d', plain_boot_script_path, boot_script_path] self.assertEqual([expected], fixture.mock.calls) def test_get_file_matching(self):