今日のx86froyoのrepo sync

android x86 
froyo86build:~/froyo86# ~/bin/repo sync
Fetching projects:  73% (111/151)  remote: Counting objects: 28, done.
remote: Compressing objects: 100% (14/14), done.
remote: Total 20 (delta 11), reused 0 (delta 0)
Unpacking objects: 100% (20/20), done.
From git://android.git.kernel.org/platform/packages/apps/Gallery3D
   8323ec1..91c18eb  master     -> korg/master
Fetching projects: 100% (151/151), done.  
froyo86build:~/froyo86# cd packages/apps/Gallery3D/
froyo86build:~/froyo86/packages/apps/Gallery3D# git log 8323ec1..91c18eb --pretty=short
commit 91c18eb00d3ee39bb3dbfcda1743b36fbbf0f0a8
Merge: 1478e50... 35d1bb2...
Author: Jean-Baptiste Queru <jbq@google.com>

    Merge "Fix for issue 8543"

commit 1478e5081ba4608baf3342109e6767c0230372ad
Author: Eric Wijngaard <ericwijngaard@gmail.com>

    When saving http uri locally download directory may not exist

commit 35d1bb22cb3fe1c6c3dcbe13a6aab25e51df61ff
Author: Eric Wijngaard <ericwijngaard@gmail.com>

    Fix for issue 8543

とりあえず、ビルドは通って、isoは起動した。

292424 extents written (571 MB)

real	149m46.286s
user	130m54.827s
sys	87m16.107s

基本的なところは、不具合も含めて、前にビルドした時と何も変わっていない。
http://d.hatena.ne.jp/kinneko/20100711/p1


vmがターゲットに追加されたので、ビルドしてみる。

froyo86build:~/froyo86# time make -j4 iso_img TARGET_PRODUCT=vm  2>&1 |tee ./make_vm.log
============================================
PLATFORM_VERSION_CODENAME=REL
PLATFORM_VERSION=2.2
TARGET_PRODUCT=vm
TARGET_BUILD_VARIANT=eng
TARGET_SIMULATOR=
TARGET_BUILD_TYPE=release
TARGET_BUILD_APPS=
TARGET_ARCH=x86
HOST_ARCH=x86
HOST_OS=linux
HOST_BUILD_TYPE=release
BUILD_ID=MASTER
============================================

こちらも普通にビルドできた。
isoの起動もgenericと変わらず。
しかし、build/target/productにはvmがないんだけど...
device/vm/vm/にいた。


夕方、アップデート追加。

From git://git.android-x86.org/platform/bootable/newinstaller
   a92e91d..e6e8c1f  froyo-x86  -> x86/froyo-x86
From git://git.android-x86.org/platform/system/core
 + 4075c7d...362cf57 froyo-x86  -> x86/froyo-x86  (forced update)

インストーラーが変更になった。usb_imgのやつか。

commit e6e8c1f982ff2c1bd71a396229b08db67840abb7
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Wed Jul 21 11:14:04 2010 +0800

    add editdisklbl to fix usb_img target
    
    We removed the obsolete diskinstaller from froyo-x86 tree.
    However, editdisklbl is necessary to build usb_img. So
    import it from diskinstaller.

commit 69ac24617075860bd6791bc45d9549461a04fe2a
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Wed Jul 21 10:10:05 2010 +0800

    redirect detect_hardware stderr to log as well

やっぱそうね。


coreには何が入ったのだろう。

commit 362cf57bea7fab7573dd56182abfbc52192cc9eb
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Wed Jul 21 15:34:39 2010 +0800

    add back libdiskconfig_host
    
    This is required by editdisklbl on building usb_img target.

commit c99f59ef20edb8a5f3d40448ccf6bd9287a3f96d
Merge: 86aee4c... 1d5fb79...
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Wed Jul 21 11:41:44 2010 +0800

    Merge branch 'mksh' into froyo-x86

commit 86aee4c639eda710267dc536e5d8d9f172a0c98f
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Wed Jul 14 14:00:41 2010 +0800

    libsysutils: reimplement NetlinkEvent::findParam in the proper way
    
    The original implementation can not find correct parameters for certain
    cases. For example, if you have both foo_bar and foo, try to find foo
    may be mismatched. The correct way is to match with "=".
    
    Change-Id: I403b1a7b889583a57a4f3a14e575181ce93b10ff

commit 1d5fb7941640d88e2cb98921202d23f24502fbc4
Author: Thorsten Glaser <tg@mirbsd.org>
Date:   Thu Jun 3 19:53:01 2010 +0200

    Add mksh-current from CVS 2010/07/15 as system/core/mksh module.
    
    Both shells (ash from system/core/sh, and mksh) are built by
    default but only the one where $(TARGET_SHELL) is set to is
    actually installed (the shell and the mkshrc configuration
    file are tagged shell_mksh for this to work). The integration
    history is available at Gerrit.
    
    Change-Id: I2021ab34da09bbae4e2dcf508296a06588337336

commit 74a24f9816b84ebe280096815a8b3edb9c6ea83c
Author: Thorsten Glaser <tg@mirbsd.org>
Date:   Mon Jun 7 10:26:37 2010 +0200

    Build ash as ash with shell_ash tag; install sh symlink
    
    Change-Id: Id1d9b9e59d3a7b14a89354cb5219f57b5806951e

commit 4075c7d4a7f28aed34c693935401e187c1daddc3
Merge: 717de5c... 25590b6...
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Sun Jul 4 17:29:36 2010 +0800

    Merge branch 'mksh' into froyo-x86

commit 25590b6341ab1efa7862dd2022662eb3e7547533
Author: Thorsten Glaser <tg@mirbsd.org>
Date:   Thu Jun 3 19:53:01 2010 +0200

    Add mksh-current from CVS 2010/06/03 as system/core/mksh module.
    
    This is disabled by default and will need $(TARGET_SHELL) to
    be set to mksh to build. Verbose change history is available
    at Gerrit; in contrast to patch set 3 of change 14171, the
    ability to write to /dev/urandom via $RANDOM and the printf
    builtin have been deactivated, and all unused files have been
    removed from the source tree (this also simplifies the NOTICE
    file); licence and copyright notices and links to the online
    manpage have been added; mkshrc has been simplified/shrunk;
    the shell is always built but not always installed. Together
    with ash, /system/bin/sh is now a symlink to either shell.
    
    Change-Id: Ic151cd2f5f4eb12857e8183301746b32fc3a65b4

commit 3eba9ddaffda9a7171da3fdc555644953ceda892
Author: Chih-Wei Huang <cwhuang@linux.org.tw>
Date:   Wed Jun 30 14:48:30 2010 +0800

    Build ash as ash, not sh, and install sh symlink if TARGET_SHELL=ash

libdiskconfigとmkshまわりだな。
mkshはメモリの少ない環境向けのフットプリントの小さいシェル。MirBSD由来。
http://www.mirbsd.org/mksh.htm
まるごとごっそり追加になっている。それもご本家の人が入れている。
busyboxのshellでは何が足りなかったのだろう。