今天遇到的问题是:
在生成x-loader, u-boot, kernel的过程中
$ git checkout -b OMAPPSP_04.02.00.07 remotes/rowboat/OMAPPSP_04.02.00.07 无法执行,
错误提示:"fatal: git checkout: updating paths is incompatible with switching branches."
解决过程及方法如下:
学习git——版本管理器,用于内核开发的版本控制工具:
主要用法有可参照:http://baike.baidu.com/view/1531489.htm#3git checkout -b|-B <new_branch> [<start point>]
用于创建以<new_branch>命名,以<start_point>为起始点的分支。本文的start_point为远程服务器的OMAPPSP_04.02.00.07。通过指令
$git remote show origin 可从远程服务器得到以下信息:
* remote origin
Fetch URL: git://gitorious.org/rowboat/x-loader.git
Push URL: git://gitorious.org/rowboat/x-loader.git
HEAD branch: master
Remote branches:
OMAPPSP_03.00.01.06 tracked
OMAPPSP_03.00.02.07 tracked
OMAPPSP_04.02.00.07 tracked
am45x-master-android tracked
master tracked
Local branch configured for 'git pull':
master merges with remote master
Local ref configured for 'git push':
master pushes to master (up to date)
顾远程服务器目录应为origin/而不是所给的remotes/rowboat。
所以,应把原指令改为$git checkout -b OMAPPSP_04.02.00.07 origin/OMAPPSP_04.02.00.07,即可执行,执行后在用$git remote show origin 查看可得:
.....
Local branches configured for 'git pull':
OMAPPSP_04.02.00.07 merges with remote OMAPPSP_04.02.00.07
master merges with remote master
Local refs configured for 'git push':
OMAPPSP_04.02.00.07 pushes to OMAPPSP_04.02.00.07 (up to date)
master pushes to master (up to date)
可知本地的OMAPPSP_04.02.00.07可与服务器同步!
编译完uboot.bin, MLO和uImage之后,在编译filesystem的时候执行指令$ make TARGET_PRODUCT=beagleboard TARGET_BUILD_TYPE=release,出现提示说要用java6,而当前版本为java5。因此下载了java6,并在.bashrc中修改了PATH。
编译filesystem真是个漫长的过程~