Git
Download
1 / 9

ALPS.GB2.MP.V1.18_KONKA75CU_GB2 - PowerPoint PPT Presentation


  • 209 Views
  • Uploaded on

Git 服务器版本库方案. ALPS.GB2.MP.V1.18_KONKA75CU_GB2. w960 产品代码. p1. p2. p3. p5. p4. 6577-4.1. M1. M2. driver. D1. D2. sys. R1. R2. w900p 产品代码. p1. p2. p3. p4. p5. Git 版本库命名规范. git 版本库分支命名规范:. git 版本库命名规范: ( 根据 MTK 代码包名字命名 ). ALPS.GB2.MP.V1.18_KONKA75CU_GB2. Git 版本库权限分配.

loader
I am the owner, or an agent authorized to act on behalf of the owner, of the copyrighted work described.
capcha
Download Presentation

PowerPoint Slideshow about ' ALPS.GB2.MP.V1.18_KONKA75CU_GB2' - carrington


An Image/Link below is provided (as is) to download presentation

Download Policy: Content on the Website is provided to you AS IS for your information and personal use and may not be sold / licensed / shared on other websites without getting consent from its author.While downloading, if for some reason you are not able to download a presentation, the publisher may have deleted the file from their server.


- - - - - - - - - - - - - - - - - - - - - - - - - - E N D - - - - - - - - - - - - - - - - - - - - - - - - - -
Presentation Transcript

Git服务器版本库方案

ALPS.GB2.MP.V1.18_KONKA75CU_GB2

w960

产品代码

p1

p2

p3

p5

p4

6577-4.1

M1

M2

driver

D1

D2

sys

R1

R2

w900p

产品代码

p1

p2

p3

p4

p5


Git版本库命名规范

git版本库分支命名规范:

git版本库命名规范:

(根据MTK代码包名字命名)

ALPS.GB2.MP.V1.18_KONKA75CU_GB2


Git 版本库权限分配

  • git版本库权限分配:


git团队之间补丁交互管理


MTK Patch合并方式

git服务器

6477-4.0-V1F 1

M1

M2

driver

D1

D2

sys

R1

R2

w900p

p1

p2

p3

p4

p5

w960

p1

p2

p3

p4

p5

w900p

p4

p1

p2

p3

p5

patch-test

git个人工作区

t1


Git个人工作区分支操作规范

git服务器

W900p

r1

r2

r3

r4

W900p

r1

r2

r4

r2`

r3

r4`

work1-user

③④

w1

git个人工作区

work2-user

w2

  • git clone -b [email protected]:ALPS.GB2.MP.V1.18_KONKA75CU_GB2

  • git checkout -b work1-user

  • git add . git add -u

  • git commit -m "myWork message"

  • git pull / git push

  • git merge --squash work1-user

  • git reset r1 --hard

  • git format-patch r1..r2`

  • git am 0001-r2`.patch


添加新项目驱动1

  • 查找与项目驱动相关的文件和文件夹:

find . -name *konka77_cu_jb*

./bootable/bootloader/lk/project/konka77_cu_jb.mk

./mediatek/config/konka77_cu_jb

./mediatek/custom/common/modem/konka77_cu_jb_hspa_v15_w900

./mediatek/custom/konka77_cu_jb

./build/target/product/security/konka77_cu_jb

./build/target/product/konka77_cu_jb.mk

./vendor/mediatek/konka77_cu_jb

./vendor/mediatek/konka77_cu_jb/artifacts/out/target/product/konka77_cu_jb


添加新项目驱动2

  • 以既有项目为基础,创建新项目驱动(脚本如下):

  • ./newP.sh konka_w900p --> ./mk konka_w900p new

#!/bin/bash

# 通过命令行参数,获取新项目名字

if [ "$1" = "" ]

then

echo Please input projectName !

exit 0

fi

newP=$1

# 找到所有名字包含konka77_cu_jb字符的文件和文件夹,并把这些文件和文件夹复制成一份新项目的文件

# 前提条件,代码中konka77_cu_jb项目已经存在,而且可以编译通过

for listP in `find . -name *konka77_cu_jb*`

do

cp -r $listP${listP//konka77_cu_jb/$newP}

done

# 修改新项目的配置文件

# ./mediatek/config/konka77_cu_jb/ProjectConfig.mk [79]

# CUSTOM_MODEM=konka77_cu_jb_hspa_v15_w900

ProjectConfig=./mediatek/config/konka77_cu_jb/ProjectConfig.mk

sed -e "s/CUSTOM_MODEM=konka77_cu_jb/CUSTOM_MODEM=$newP/g" -i ${ProjectConfig//konka77_cu_jb/$newP}


系统分支补丁文件:

读取: /mnt/gitPatch/sys

上传: scp -r 补丁目录 [email protected]:./

驱动分支补丁文件:

读取: /mnt/gitPatch/driver

上传: scp -r 补丁目录 [email protected]:./

补丁文件夹命名规范:

sys-1bcb4fa..56c360b

sys-56c360b..f4a0bb4

初始密码, konka

vi /etc/rc.local

mkdir -p /mnt/gitPatch/driver

mkdir -p /mnt/gitPatch/sys

mount -o username=driverbr,password=konka,iocharset=utf8 //172.21.5.240/driverbr /mnt/gitPatch/driver

mount -o username=sysbr,password=konka,iocharset=utf8 //172.21.5.240/sysbr /mnt/gitPatch/sys


ad