查看清单文件： vi .repo/manifests/default.xml

lijianxiong@ljx-dev:~/workspaceCleanUI/esiper-cleanui/espier-cleanui$ git status
# On branch dev
nothing to commit (working directory clean)
lijianxiong@ljx-dev:~/workspaceCleanUI/esiper-cleanui/espier-cleanui$ git pull
You asked me to pull without telling me which branch you
want to merge with,and 'branch.dev.merge' in
your configuration file does not tell me,either. Please
specify which branch you want to use on the command line and
try again (e.g. 'git pull <repository> <refspec>').
See git-pull(1) for details.

If you often merge with the same branch,you may want to
use something like the following in your configuration file:
[branch "dev"]
remote = <nickname>
merge = <remote-ref>

[remote "<nickname>"]
url = <url>
fetch = <refspec>

See git-config(1) for details.

运行如下解决：

lijianxiong@ljx-dev:~/workspaceCleanUI/esiper-cleanui/espier-cleanui$ git config branch.dev.remote origin
lijianxiong@ljx-dev:~/workspaceCleanUI/esiper-cleanui/espier-cleanui$ git config branch.dev.merge refs/heads/dev

--------------------------------------------------------上面是工作中的问题-----------------------------------------------------------------------------------------------------------

借助repo同步代码时，可以使用不同的manifest.xml文件替换以达到同步不同代码的目的，这里记下先。

1.首先新建一个存放源码的目录，并进入：

$ mkdir SRC

$ cd SRC

2.从服务器上下载repo工具：

$git clone git://192.168.1.1/tools/repo.git

此时，目录里就有repo文件夹了，里面有repo可执行文件

3.初始化.repo文件夹

$./repo/repo init -u git://192.168.1.1/branch/manifest.git

这时，目录下就了隐藏的.repo文件夹了，在.repo文件夹中，有如下几个文件及目录：

drwxr-xr-x 3 ritter ritter 4096 2012-07-23 15:59 manifests
drwxr-xr-x 8 ritter ritter 4096 2012-07-23 15:34 manifests.git
lrwxrwxrwx 1 ritter ritter 21 2012-07-23 16:01 manifest.xml -> manifests/default.xml
drwxr-xr-x 7 ritter ritter 4096 2012-07-23 15:38 repo

其中manifest.xml是一个软链接，指向manifests/default.xml

4.现在，将有下载源码信息的manifest.xml拷入SRC/.repo/manifests/下，并添加执行权限：

$ cp manifest.xml SRC/.repo/manifests/

$ chmod +xSRC/.repo/manifests/manifest.xml

此处注意，如果xml文件名不是manifest.xml也是可以的。

5.然后回到SRC/目录中，执行：

$ ./repo/repo init -m manifest.xml

使用repo工具，将默认的xml文件从default.xml改成manifest.xml，

6.此时，再到.repo/下查看manifest.xml软链接的目标，已经换成manifests/manifest.xml了：

& ls -l SRC/.repo/

drwxr-xr-x 3ritterritter 4096 2012-07-23 15:59 manifests
drwxr-xr-x 8ritterritter4096 2012-07-23 15:34 manifests.git
lrwxrwxrwx 1ritterritter 21 2012-07-23 16:01 manifest.xml -> manifests/manifest.xml
drwxr-xr-x 7ritterritter4096 2012-07-23 15:38 repo

然后，执行repo sync时，同步的代码就是根据新copy的manifest.xml来进行同步的了。

顺便记下，在chooseproduct时，可以进入vendor下查看

choosecombo选择编译版本

编译时，

1.先编译kernel

进入kernel目录，make kernel。

2.然后是system

在源码根目录中,make all -j4

3.最后是uboot

进入boot目录，make uboot

cd kernel/; make all; cd ../; make -j4; cd boot; make all; cd kernel/; make telephony;

具体还需要看Makefile