From patchwork Fri Nov 30 08:53:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yongqin Liu X-Patchwork-Id: 13300 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 42A092424F for ; Fri, 30 Nov 2012 08:53:15 +0000 (UTC) Received: from mail-ia0-f180.google.com (mail-ia0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id AD9C1A19108 for ; Fri, 30 Nov 2012 08:53:14 +0000 (UTC) Received: by mail-ia0-f180.google.com with SMTP id t4so167563iag.11 for ; Fri, 30 Nov 2012 00:53:14 -0800 (PST) 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=OOMDQgHTtxYbrhyY99QpmJ9URfumVWMQxfodzPBJlP4=; b=l2A4iuJxDt1ehDhv+jI+rHp6+pvPas4XSiB5E4dNlOxKqUQycuASjJaibw/hvT2xHm cjsX9G3UniGlAzIdbkoY8fwERlbWrh4fZPh0SRrXXI4YxB83KHl/w67ostCoXARtU0Jm 1SJr2OQJx/6RjxdjgNm7yAymjkwFWp4FQrhHgcpLz7xPg6J/IiLIBX8aTy6kaq5IXSl7 DUvzNWZ8WfJGXoQxpwRCJHoNsjchSID4lwpMravQD++f23AQfln1GCynEqqTm2jLZYrm h1dFUz0tVxmWN+hdnVWHaYN/W6MKisrHq+NjgCwK7U2/C3EIRJD1dJEFY0r0LP1kvXCj O7bQ== Received: by 10.43.49.199 with SMTP id vb7mr412533icb.6.1354265593974; Fri, 30 Nov 2012 00:53:13 -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.50.67.148 with SMTP id n20csp993824igt; Fri, 30 Nov 2012 00:53:12 -0800 (PST) Received: by 10.180.93.69 with SMTP id cs5mr813068wib.3.1354265591769; Fri, 30 Nov 2012 00:53:11 -0800 (PST) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id v18si2538586weo.145.2012.11.30.00.53.10 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 30 Nov 2012 00:53:11 -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 1TeMLO-0000GO-9l for ; Fri, 30 Nov 2012 08:53:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 3CB5BE03D1 for ; Fri, 30 Nov 2012 08:53:10 +0000 (UTC) MIME-Version: 1.0 X-Launchpad-Project: lava-dispatcher X-Launchpad-Branch: ~linaro-validation/lava-dispatcher/trunk X-Launchpad-Message-Rationale: Subscriber X-Launchpad-Branch-Revision-Number: 473 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 473: update the source for mount partitions of android and make it a little flexible Message-Id: <20121130085310.7161.12540.launchpad@ackee.canonical.com> Date: Fri, 30 Nov 2012 08:53:10 -0000 Reply-To: noreply@launchpad.net Sender: bounces@canonical.com Errors-To: bounces@canonical.com Precedence: bulk X-Generated-By: Launchpad (canonical.com); Revision="16319"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: ee84f29f221a71be7ec48aa22b215a4817b2b426 X-Gm-Message-State: ALoCoQn8HBCFujHO4EANUM248GdzcfIIX5JPeRgm/4/jEvlsquYJum0BlZGzwag0fIBIv1gjjg1N Merge authors: Yongqin Liu (liuyq0307) Related merge proposals: https://code.launchpad.net/~liuyq0307/lava-dispatcher/update-mount-partitions/+merge/137106 proposed by: Yongqin Liu (liuyq0307) review: Approve - Andy Doan (doanac) https://code.launchpad.net/~liuyq0307/lava-dispatcher/test-bootloader/+merge/123225 proposed by: Yongqin Liu (liuyq0307) https://code.launchpad.net/~liuyq0307/lava-dispatcher/deployment-for-omapzoom-aosp/+merge/114553 proposed by: Yongqin Liu (liuyq0307) review: Approve - Michael Hudson-Doyle (mwhudson) ------------------------------------------------------------ revno: 473 [merge] committer: Yongqin Liu branch nick: lava-dispatcher timestamp: Fri 2012-11-30 16:51:45 +0800 message: update the source for mount partitions of android and make it a little flexible modified: lava_dispatcher/config.py lava_dispatcher/device/master.py --- lp:lava-dispatcher https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk You are subscribed to branch lp:lava-dispatcher. To unsubscribe from this branch go to https://code.launchpad.net/~linaro-validation/lava-dispatcher/trunk/+edit-subscription === modified file 'lava_dispatcher/config.py' --- lava_dispatcher/config.py 2012-11-16 00:47:20 +0000 +++ lava_dispatcher/config.py 2012-11-30 01:54:29 +0000 @@ -66,6 +66,9 @@ sys_part_android_org = schema.IntOption() val = schema.StringOption() sdcard_mountpoint_path = schema.StringOption(default="/storage/sdcard0") + possible_partitions_files = schema.ListOption(default=["init.partitions.rc", + "fstab.partitions", + "init.rc"]) simulator_version_command = schema.StringOption() simulator_command = schema.StringOption() === modified file 'lava_dispatcher/device/master.py' --- lava_dispatcher/device/master.py 2012-11-21 22:07:45 +0000 +++ lava_dispatcher/device/master.py 2012-11-30 01:57:34 +0000 @@ -592,7 +592,7 @@ data_part_lava = session._client.config.data_part_android session.run( - 'sed -i "/mount ext4 \/dev\/block\/mmcblk0p%s/d" %s' + 'sed -i "/\/dev\/block\/mmcblk0p%s/d" %s' % (cache_part_org, rc_filename), failok=True) session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s' @@ -617,17 +617,20 @@ session.run('mv uInitrd.data ramdisk.cpio.gz') session.run('gzip -d -f ramdisk.cpio.gz; cpio -i -F ramdisk.cpio') + session.run( + 'sed -i "/export PATH/a \ \ \ \ export PS1 \'%s\'" init.rc' % + target.ANDROID_TESTER_PS1) + # The mount partitions have moved from init.rc to init.partitions.rc # For backward compatible with early android build, we update both rc files - _update_uInitrd_partitions(session, 'init.rc') - _update_uInitrd_partitions(session, 'init.partitions.rc') - - session.run( - 'sed -i "/export PATH/a \ \ \ \ export PS1 \'%s\'" init.rc' % - target.ANDROID_TESTER_PS1) - - session.run("cat init.rc") - session.run("cat init.partitions.rc", failok=True) + # For omapzoom and aosp and JB4.2 the operation for mounting partitions are + # in init.omap4pandaboard.rc and fstab.* files + possible_partitions_files = session._client.config.possible_partitions_files + + for f in possible_partitions_files: + if session.is_file_exist(f): + _update_uInitrd_partitions(session, f) + session.run("cat %s" % f, failok=True) session.run('cpio -i -t -F ramdisk.cpio | cpio -o -H newc | \ gzip > ramdisk_new.cpio.gz')