今日のrepo sync

android x86

Etherの切り替えパッチは入ったのかな？
まだ手パッチかな？入ってるみたい。
MIDからのポリシーの変更は反映されているっぽいな。

patissier:~/mydroid# ~/bin/repo sync
Fetching projects:   5% (7/138)  remote: Counting objects: 7, done.
remote: Compressing objects: 100% (4/4), done.
remote: Total 4 (delta 3), reused 0 (delta 0)
Unpacking objects: 100% (4/4), done.
From git://git.android-x86.org/platform/build
   dc35854..dae17b0  master     -> x86/master
Fetching projects:  42% (58/138)  remote: Counting objects: 1912, done.
remote: Compressing objects: 100% (969/969), done.
Receiving objects: 100% (1282/1282), 3.56 MiB | 126 KiB/s, done.
remote: Total 1282 (delta 1108), reused 474 (delta 302)
Resolving deltas: 100% (1108/1108), completed with 584 local objects.
From git://android.git.kernel.org/platform/external/opencore
   98173ad..37ae615  master     -> korg/master
Fetching projects:  60% (83/138)  remote: Counting objects: 115, done.
remote: Compressing objects: 100% (62/62), done.
remote: Total 76 (delta 36), reused 15 (delta 0)
Unpacking objects: 100% (76/76), done.
From git://git.android-x86.org/platform/frameworks/base
   f974d6b..9330942  master     -> x86/master
Fetching projects:  63% (87/138)  remote: Counting objects: 27, done.
remote: Compressing objects: 100% (10/10), done.
remote: Total 18 (delta 6), reused 0 (delta 0)
Unpacking objects: 100% (18/18), done.
From git://git.android-x86.org/platform/frameworks/policies/base
   e22ea07..6e9937b  master     -> x86/master
remote: Counting objects: 302248, done.
remote: Compressing objects: 100% (47247/47247), done.
remote: Total 288316 (delta 236768), reused 288179 (delta 236635)
Receiving objects: 100% (288316/288316), 66.21 MiB | 61 KiB/s, done.
Resolving deltas: 100% (236768/236768), completed with 11916 local objects.
From git://git.android-x86.org/kernel/common
   030bcd7..e8f7563  android-2.6.29 -> x86/android-2.6.29
 * [new branch]      android-2.6.32 -> x86/android-2.6.32
Fetching projects:  81% (112/138)  remote: Counting objects: 48, done.
remote: Compressing objects: 100% (26/26), done.
remote: Total 35 (delta 15), reused 4 (delta 0)
Unpacking objects: 100% (35/35), done.
From git://git.android-x86.org/platform/packages/apps/Settings
   5854d6d..82f2872  master     -> x86/master
Fetching projects:  99% (137/138)  remote: Counting objects: 8, done.
remote: Compressing objects: 100% (7/7), done.
remote: Total 7 (delta 2), reused 0 (delta 0)
Unpacking objects: 100% (7/7), done.
From git://git.android-x86.org/platform/vendor/asus/eeepc
   29c072c..d1ee803  master     -> x86/master
Fetching projects: 100% (138/138), done.  
Syncing work tree:  41% (57/137)  error: You have local changes to 'Config.mk'; cannot switch branches.
Syncing work tree: 100% (137/137), done.  

error: external/opencore/: platform/external/opencore checkout 37ae61565b5d4a09ae3b3b0b734934a0b8ee13e9 
patissier:~/mydroid# cd external/opencore/
patissier:~/mydroid/external/opencore# patch -p1 < ../../../open_core_build_break.diff 
patching file pvmi/pvmf/include/pvmf_event_handling.h
patching file pvmi/pvmf/src/pvmf_event_handling.cpp
Hunk #1 succeeded at 19 (offset -34 lines).
Hunk #2 succeeded at 86 (offset -34 lines).
patissier:~/mydroid/external/opencore# patch -p1 < ../../../open_core_build_break_2.diff 
patching file Config.mk
Hunk #1 FAILED at 9.
1 out of 1 hunk FAILED -- saving rejects to file Config.mk.rej

2のほうは入っているのかな？

patissier:~/mydroid/external/opencore# more Config.mk.rej
*************** ifeq ($(PLATFORM_VERSION),1.5)
*** 9,16 ****
  else ifeq ($(PLATFORM_VERSION),1.6)
      PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS
=64 -DUSE_CML2_CONFIG
  else
      PV_CFLAGS := -Wno-psabi -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_
OFFSET_BITS=64 -DUSE_CML2_CONFIG
  endif
  
    ifeq ($(PV_WERROR),1)
      PV_CFLAGS += -Werror
--- 9,20 ----
  else ifeq ($(PLATFORM_VERSION),1.6)
      PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS
=64 -DUSE_CML2_CONFIG
  else
+ ifeq ($(TARGET_ARCH),x86)
+     PV_CFLAGS := -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS
=64 -DUSE_CML2_CONFIG
+ else
      PV_CFLAGS := -Wno-psabi -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_
OFFSET_BITS=64 -DUSE_CML2_CONFIG
  endif
+ endif
  
    ifeq ($(PV_WERROR),1)
      PV_CFLAGS += -Werror

あ、もういらないのか。

This patch may not be required anymore