git系列------如何升级fw(测试专用)

来源:互联网 发布:管道安装算法 编辑:程序博客网 时间:2024/06/07 07:15

  最近怀疑bug是由于fw太旧的问题,所以就升级一下fw作为测试

首先git clone下载fw

然后到vendor/qcom/proprietary目录下做patch,git log找到第一条提交

commit 6e60d7404fd375f9eca2c79a0a0e4ff76ed4cb06
Author: matthew_xuan <Matthew_Xuan@asus.com>
Date:   Wed Dec 21 15:19:50 2016 +0800


    init
    
    Signed-off-by: matthew_xuan <Matthew_Xuan@asus.com>

然后git format-patch -s efc594e56b60192bd4e6c30871021842319afc62把这条提交之后的提交都给做成patch

然后到fw所在文件夹下的spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom目录下准备打patch

结果

matthew@matthew:/media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom$ git am /media/matt2/aquarius-n-mp-branch-21.40.15-1/vendor/qcom/proprietaryqq/0003-MSM8953-BSP-RIL-add-ASUS-Event-Log-for-RIL-4-4.patch
previous rebase directory /media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/.git/rebase-apply still exists but mbox given.
matthew@matthew:/media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom$ ls
DEADJOE  proprietary
matthew@matthew:/media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom$ cd proprietary/
matthew@matthew:/media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom/proprietary$ git init
Initialized empty Git repository in /media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom/proprietary/.git/
matthew@matthew:/media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom/proprietary$ ls
android-perf  csm      fastmmi   kernel-tests             mm-camerasdk  mm-video        qcril               qmi-framework  securemsm         telephony-apps      ultrasound  wlan
biometrics    data     fm        llvm-arm-toolchain-ship  mm-core       mm-video-utils  qcrilOemHook        qrdplus        sensors           telephony-fwk       vpp
bt            diag     ftm       mdm-helper               mm-osal       modem-apis      qcril-qmi-services  remotefs       SmartCardService  thermal-engine      wfd
cne           display  gps       mm-audio                 mm-parser     nqnfc-firmware  qdssagent           scve           ss-restart        time-services       wigig
common        fastcv   ims-ship  mm-camera                mm-still      prebuilt_HY11   qmi                 SecProtect     ss-services       uim_remote_service  wipower
matthew@matthew:/media/matt2/spf2.0-r05000.1.75484.1/qcom_firmware/LA.UM.5.6/LINUX/android/vendor/qcom/proprietary$ git am /media/matt2/aquarius-n-mp-branch-21.40.15-1/vendor/qcom/proprietaryqq/0003-MSM8953-BSP-RIL-add-ASUS-Event-Log-for-RIL-4-4.patch
Applying: add ASUS Event Log for RIL (4/4)
error: qcril/common/data/qcril_data_netctrl.c: does not exist in index
error: qcril/common/data/qcril_data_req_resp.c: does not exist in index
error: qcril/qcril_qmi/qcril_log.c: does not exist in index
error: qcril/qcril_qmi/qcril_log.h: does not exist in index
Patch failed at 0001 add ASUS Event Log for RIL (4/4)
When you have resolved this problem run "git am --resolved".
If you would prefer to skip this patch, instead run "git am --skip".
To restore the original branch and stop patching run "git am --abort".


很明显出错了,原因在于patch里修改的文件的路径其实和fw这边的git不是同一个,也就是起始目录不同,所以只能在

qcom目录下

git init


git add -A


git commit -s -m "init"

新建git然后打上第一个git log

然后在git apply --reject patch名直接打即可


0 0
原创粉丝点击