From patchwork Sun Apr 1 20:39:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael-Doyle Hudson X-Patchwork-Id: 7557 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 91C0123E12 for ; Sun, 1 Apr 2012 20:39:14 +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 157F9A18A57 for ; Sun, 1 Apr 2012 20:39:13 +0000 (UTC) Received: by iage36 with SMTP id e36so4701307iag.11 for ; Sun, 01 Apr 2012 13:39:13 -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=Nw7NvYkdebho90d0VN5KN1EPo8Yib0c8fxeogt6JCdA=; b=Z4CadoDLw7xdwhFyW0RMhMOr2sLFQnLPRqj1Ccrvu+57NPBMq0Uxo/O7f+6Kq6QhvV tXnAmX2CEgzn/M3FWdrZggL8OAkvbnBHnEMmbdnTs+eEYrkth9yFuOJGuVuMXqr+1GTT qXMm+lxpOwb29f3VhZN4XYaD9DPEi9WsYrlfrQ52eKPtEQSRADUD7h5fmTLYfkZD61qz mZNy3tTZiS7tcehiirXC7IsQAMtbqUIA1TY0TPlXAUIEOgrU70jx4QiDvxz53Qn7mA2l hR/fklFP8TDlKSi4/ZpHO5wtBQLKNZJEkwtq8i7wELGIDfEd5yMX7E7NxWo9px/+eaLf Vnlw== Received: by 10.50.42.132 with SMTP id o4mr3717134igl.41.1333312753279; Sun, 01 Apr 2012 13:39:13 -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.231.5.205 with SMTP id 13csp81501ibw; Sun, 1 Apr 2012 13:39:12 -0700 (PDT) Received: by 10.180.98.8 with SMTP id ee8mr18005174wib.14.1333312751640; Sun, 01 Apr 2012 13:39:11 -0700 (PDT) Received: from indium.canonical.com (indium.canonical.com. [91.189.90.7]) by mx.google.com with ESMTPS id j9si9836128wia.32.2012.04.01.13.39.10 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 01 Apr 2012 13:39:11 -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 1SERYM-0005dU-CK for ; Sun, 01 Apr 2012 20:39:10 +0000 Received: from ackee.canonical.com (localhost [127.0.0.1]) by ackee.canonical.com (Postfix) with ESMTP id 4E68AE0433 for ; Sun, 1 Apr 2012 20:39: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: 268 X-Launchpad-Notification-Type: branch-revision To: Linaro Patch Tracker From: noreply@launchpad.net Subject: [Branch ~linaro-validation/lava-dispatcher/trunk] Rev 268: Fix boot android image problem caused by changing of init.rc file (ChiThu) Message-Id: <20120401203910.12977.52339.launchpad@ackee.canonical.com> Date: Sun, 01 Apr 2012 20:39: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="15032"; Instance="launchpad-lazr.conf" X-Launchpad-Hash: 3faddf723f1d5892825543a56e0d06b7948b8589 X-Gm-Message-State: ALoCoQlNccxjW0BiWz8aYokYSYe6tc2MpEum9IlCsc+VXMkOY1tI8snH3J9TGzkpqXrYZi2P2293 Merge authors: Le Chi Thu le.chi.thu@linaro.org Related merge proposals: https://code.launchpad.net/~le-chi-thu/lava-dispatcher/fix-android-boot-problem/+merge/100275 proposed by: Le Chi Thu (le-chi-thu) review: Approve - Zygmunt Krynicki (zkrynicki) ------------------------------------------------------------ revno: 268 [merge] committer: Michael Hudson-Doyle branch nick: trunk timestamp: Mon 2012-04-02 08:36:53 +1200 message: Fix boot android image problem caused by changing of init.rc file (ChiThu) modified: doc/changes.rst lava_dispatcher/client/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 'doc/changes.rst' --- doc/changes.rst 2012-03-27 01:33:15 +0000 +++ doc/changes.rst 2012-04-01 20:36:53 +0000 @@ -5,6 +5,7 @@ Version 0.5.11 ============== +* Fixed boot android image problem caused by changing of init.rc file. * Add qemu_drive_interface configuration option for the LAVA QEMU client. .. _version_0_5_10: === modified file 'lava_dispatcher/client/master.py' --- lava_dispatcher/client/master.py 2012-03-20 06:59:13 +0000 +++ lava_dispatcher/client/master.py 2012-03-31 09:42:26 +0000 @@ -116,10 +116,7 @@ _recreate_uInitrd(session) - session.run('umount /mnt/lava/boot') - -def _recreate_uInitrd(session): - logging.debug("Recreate uInitrd") +def _update_uInitrd_partitions(session, rc_filename): # Original android sdcard partition layout by l-a-m-c sys_part_org = session._client.device_option("sys_part_android_org") cache_part_org = session._client.device_option("cache_part_android_org") @@ -128,6 +125,23 @@ sys_part_lava = session._client.device_option("sys_part_android") data_part_lava = session._client.device_option("data_part_android") + session.run( + 'sed -i "/mount ext4 \/dev\/block\/mmcblk0p%s/d" %s' + % (cache_part_org, rc_filename), failok=True) + + session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s' + % (data_part_org, data_part_lava, rc_filename), failok=True) + session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" %s' + % (sys_part_org, sys_part_lava, rc_filename), failok=True) + # for snowball the mcvblk1 is used instead of mmcblk0. + session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" %s' + % (data_part_org, data_part_lava, rc_filename), failok=True) + session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" %s' + % (sys_part_org, sys_part_lava, rc_filename), failok=True) + +def _recreate_uInitrd(session): + logging.debug("Recreate uInitrd") + session.run('mkdir -p ~/tmp/') session.run('mv /mnt/lava/boot/uInitrd ~/tmp') session.run('cd ~/tmp/') @@ -136,26 +150,17 @@ 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 "/mount ext4 \/dev\/block\/mmcblk0p%s/d" init.rc' - % cache_part_org) -# session.run( -# 'sed -i "/mount ext4 \/dev\/block\/mmcblk0p%s/d" init.rc' -# % data_part_org) - session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" init.rc' - % (data_part_org, data_part_lava)) - session.run('sed -i "s/mmcblk0p%s/mmcblk0p%s/g" init.rc' - % (sys_part_org, sys_part_lava)) - # for snowball the mcvblk1 is used instead of mmcblk0. - session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" init.rc' - % (data_part_org, data_part_lava)) - session.run('sed -i "s/mmcblk1p%s/mmcblk1p%s/g" init.rc' - % (sys_part_org, sys_part_lava)) - # failok true for this?: + + # The mount partitions have moved from init.rc to init.partitions.rc + # For backward compatible with early android build, we updatep 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 root@linaro: " init.rc') session.run("cat init.rc") + session.run("cat init.partitions.rc", failok=True) session.run( 'cpio -i -t -F ramdisk.cpio | cpio -o -H newc | \