Firefly开源社区

标题: ROC-RK3568-PC在步骤1.1.2. 同步代码执行.repo/repo/repo sync -c --no-tags步骤报错 [打印本页]

---

作者: 苏宏毅    时间: 2024-3-17 23:34
标题: ROC-RK3568-PC在步骤1.1.2. 同步代码执行.repo/repo/repo sync -c --no-tags步骤报错
我的虚拟机是ubuntu18.04_64
执行到的命令是
user@linux:~/proj/rk356x_sdk-linux5.10$ .repo/repo/repo sync -c --no-tags
Fetching project external/xserver
Fetching project rkbin
Fetching project external/rockit
Fetching project external/rk_pcba_test
Skipped fetching project external/xserver (already have persistent ref)
Skipped fetching project rkbin (already have persistent ref)
Skipped fetching project external/rockit (already have persistent ref)
Skipped fetching project external/rk_pcba_test (already have persistent ref)
Fetching project docs-soc_internal-cn
Fetching project external/rockchip-test
Fetching project external/mpp
Skipped fetching project docs-soc_internal-cn (already have persistent ref)
Skipped fetching project external/rockchip-test (already have persistent ref)
Skipped fetching project external/mpp (already have persistent ref)
Fetching project docs-cn
Fetching project external/drm-cursor
Skipped fetching project docs-cn (already have persistent ref)
Fetching project external/gstreamer-rockchip
Fetching project external/rkwifibt-app
Skipped fetching project external/drm-cursor (already have persistent ref)
Fetching project external/quectel-cm
Skipped fetching project external/gstreamer-rockchip (already have persistent ref)
Skipped fetching project external/rkwifibt-app (already have persistent ref)
Skipped fetching project external/quectel-cm (already have persistent ref)
Fetching project docs
Fetching project kernel
Fetching project external/libmali
Skipped fetching project docs (already have persistent ref)
Fetching project tools
Skipped fetching project kernel (already have persistent ref)
Skipped fetching project external/libmali (already have persistent ref)
Skipped fetching project tools (already have persistent ref)
Fetching project external/alsa-config
Fetching project external/rktoolkit
Fetching project buildroot-dl
Fetching project external/uvc_app
Skipped fetching project external/alsa-config (already have persistent ref)
Skipped fetching project buildroot-dl (already have persistent ref)
Skipped fetching project external/rktoolkit (already have persistent ref)
Fetching project buildroot
Skipped fetching project external/uvc_app (already have persistent ref)
Fetching project docs-en
Fetching project external/rkscript
Skipped fetching project buildroot (already have persistent ref)
Fetching project external/common_algorithm
Skipped fetching project docs-en (already have persistent ref)
Skipped fetching project external/common_algorithm (already have persistent ref)
Skipped fetching project external/rkscript (already have persistent ref)
Fetching project external/linux-rga
Fetching project external/dpdk
Fetching project prebuilts/gcc/linux-x86/arm/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf
Skipped fetching project external/linux-rga (already have persistent ref)
Skipped fetching project external/dpdk (already have persistent ref)
Fetching project app/rkadk
Skipped fetching project prebuilts/gcc/linux-x86/arm/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf (already have persistent ref)
Fetching project external/security/rk_tee_user
Fetching project u-boot
Skipped fetching project app/rkadk (already have persistent ref)
Skipped fetching project external/security/rk_tee_user (already have persistent ref)
Fetching project external/rknpu2
Fetching project external/chromium
Fetching project docs-soc_internal-en
Skipped fetching project external/rknpu2 (already have persistent ref)
Skipped fetching project u-boot (already have persistent ref)
Skipped fetching project external/chromium (already have persistent ref)
Skipped fetching project docs-soc_internal-en (already have persistent ref)
Fetching project external/rknn-toolkit2
Fetching project external/rkwifibt
Fetching project external/security/bin
Fetching project prebuilts/gcc/linux-x86/aarch64/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu
Skipped fetching project external/rkwifibt (already have persistent ref)
Skipped fetching project external/rknn-toolkit2 (already have persistent ref)
Skipped fetching project external/security/bin (already have persistent ref)
Skipped fetching project prebuilts/gcc/linux-x86/aarch64/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu (already have persistent ref)
Fetching project external/recovery
Fetching project external/uac_app
Fetching project external/rkupdate
Skipped fetching project external/uac_app (already have persistent ref)
Skipped fetching project external/recovery (already have persistent ref)
Skipped fetching project external/rkupdate (already have persistent ref)
Fetching project app/lvgl_demo
Fetching project device/rockchip
Fetching project external/camera_engine_rkaiq
Fetching project external/security/librkcrypto
Skipped fetching project app/lvgl_demo (already have persistent ref)
Skipped fetching project device/rockchip (already have persistent ref)
Skipped fetching project external/camera_engine_rkaiq (already have persistent ref)
Skipped fetching project external/security/librkcrypto (already have persistent ref)
Checking out project app/lvgl_demo
Checking out project app/rkadk
Checking out project buildroot
Checking out project buildroot-dl
Checking out project device/rockchip
Checking out project docs
Checking out project docs-cn
Checking out project docs-soc_internal-cn
project docs/cn/RK3566_RK3568/
Updating fdeeb5b..1371766
error: The following untracked working tree files would be overwritten by merge:
    Rockchip_Developer_Guide_Linux_Software_CN.pdf
Please move or remove them before you merge.
Aborting

error: Cannot checkout docs-soc_internal-cn

error: Exited sync due to checkout errors
已经很多天了试了N次并且使用sync -f也不能解决，应该怎么办呢


tchip_askquestions

report.txt

2024-3-17 23:34 上传

点击文件名下载附件

下载积分: 灯泡 -1 , 经验 -1

5.48 KB, 下载次数: 0, 下载积分: 灯泡 -1 , 经验 -1

---

作者: zhangzhenzhao    时间: 2024-3-18 09:14
日志提示Please move or remove them before you merge.，可以尝试将Rockchip_Developer_Guide_Linux_Software_CN.pdf这部分删掉，再同步

---

作者: 苏宏毅    时间: 2024-3-18 09:38

zhangzhenzhao 发表于 2024-3-18 09:14
日志提示Please move or remove them before you merge.，可以尝试将Rockchip_Developer_Guide_Linux_Softw ...

已经删除了文件，执行.repo/repo/repo sync -c --no-tags指令后还是有这个报错
user@Linux:~/proj/rk356x_sdk-linux5.10$ .repo/repo/repo sync -c --no-tags
Fetching project external/xserver
Fetching project rkbin
Fetching project external/rockit
Fetching project external/rk_pcba_test
Skipped fetching project rkbin (already have persistent ref)
Skipped fetching project external/xserver (already have persistent ref)
Skipped fetching project external/rockit (already have persistent ref)
Skipped fetching project external/rk_pcba_test (already have persistent ref)
Fetching project docs-soc_internal-cn
Fetching project external/rockchip-test
Fetching project external/mpp
Fetching project docs-cn
Skipped fetching project docs-soc_internal-cn (already have persistent ref)
Skipped fetching project external/rockchip-test (already have persistent ref)
Skipped fetching project external/mpp (already have persistent ref)
Skipped fetching project docs-cn (already have persistent ref)
Fetching project external/gstreamer-rockchip
Fetching project external/rkwifibt-app
Fetching project external/quectel-cm
Fetching project docs
Skipped fetching project external/quectel-cm (already have persistent ref)
Skipped fetching project external/gstreamer-rockchip (already have persistent ref)
Skipped fetching project external/rkwifibt-app (already have persistent ref)
Skipped fetching project docs (already have persistent ref)
Fetching project external/security/bin
Fetching project kernel
Fetching project external/libmali
Fetching project tools
Skipped fetching project external/security/bin (already have persistent ref)
Skipped fetching project tools (already have persistent ref)
Skipped fetching project kernel (already have persistent ref)
Skipped fetching project external/libmali (already have persistent ref)
Fetching project external/alsa-config
Fetching project external/rktoolkit
Fetching project buildroot-dl
Fetching project external/uvc_app
Skipped fetching project external/alsa-config (already have persistent ref)
Skipped fetching project external/uvc_app (already have persistent ref)
Skipped fetching project buildroot-dl (already have persistent ref)
Skipped fetching project external/rktoolkit (already have persistent ref)
Fetching project buildroot
Fetching project docs-en
Fetching project external/rkscript
Skipped fetching project buildroot (already have persistent ref)
Skipped fetching project docs-en (already have persistent ref)
Fetching project external/common_algorithm
Skipped fetching project external/rkscript (already have persistent ref)
Skipped fetching project external/common_algorithm (already have persistent ref)
Fetching project external/linux-rga
Fetching project external/dpdk
Fetching project prebuilts/gcc/linux-x86/arm/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf
Skipped fetching project external/linux-rga (already have persistent ref)
Skipped fetching project external/dpdk (already have persistent ref)
Skipped fetching project prebuilts/gcc/linux-x86/arm/gcc-arm-10.3-2021.07-x86_64-arm-none-linux-gnueabihf (already have persistent ref)
Fetching project app/rkadk
Fetching project external/security/rk_tee_user
Fetching project u-boot
Skipped fetching project app/rkadk (already have persistent ref)
Fetching project external/rknpu2
Skipped fetching project u-boot (already have persistent ref)
Skipped fetching project external/security/rk_tee_user (already have persistent ref)
Fetching project external/chromium
Skipped fetching project external/rknpu2 (already have persistent ref)
Skipped fetching project external/chromium (already have persistent ref)
Fetching project docs-soc_internal-en
Fetching project external/rknn-toolkit2
Skipped fetching project docs-soc_internal-en (already have persistent ref)
Fetching project external/rkwifibt
Fetching project external/drm-cursor
Skipped fetching project external/rknn-toolkit2 (already have persistent ref)
Fetching project prebuilts/gcc/linux-x86/aarch64/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu
Skipped fetching project external/rkwifibt (already have persistent ref)
Skipped fetching project external/drm-cursor (already have persistent ref)
Fetching project external/recovery
Skipped fetching project external/recovery (already have persistent ref)
Skipped fetching project prebuilts/gcc/linux-x86/aarch64/gcc-arm-10.3-2021.07-x86_64-aarch64-none-linux-gnu (already have persistent ref)
Fetching project external/uac_app
Fetching project external/rkupdate
Skipped fetching project external/uac_app (already have persistent ref)
Skipped fetching project external/rkupdate (already have persistent ref)
Fetching project app/lvgl_demo
Fetching project device/rockchip
Fetching project external/camera_engine_rkaiq
Skipped fetching project device/rockchip (already have persistent ref)
Skipped fetching project app/lvgl_demo (already have persistent ref)
Skipped fetching project external/camera_engine_rkaiq (already have persistent ref)
Fetching project external/security/librkcrypto
Skipped fetching project external/security/librkcrypto (already have persistent ref)
Checking out project app/lvgl_demo
Checking out project app/rkadk
Checking out project buildroot
Checking out project buildroot-dl
Checking out project device/rockchip
Checking out project docs
Checking out project docs-cn
Checking out project docs-soc_internal-cn
Checking out project docs-en
Checking out project docs-soc_internal-en
Checking out project external/alsa-config
Checking out project external/camera_engine_rkaiq
Checking out project external/chromium
Checking out project external/common_algorithm
Checking out project external/dpdk
external/dpdk/: manifest switched refs/heads/rk356x/firefly-5.10...refs/tags/rk356x/linux5.10_release_v1.4.0a
error: external/dpdk/: discarding 3 commits removed from upstream
error: Cannot checkout external/dpdk

error: Exited sync due to checkout errors

---

作者: Liuth    时间: 2024-3-19 09:16

苏宏毅 发表于 2024-3-18 09:38
已经删除了文件，执行.repo/repo/repo sync -c --no-tags指令后还是有这个报错
user@Linux:~/proj/rk356 ...

同理，删掉 external/dpdk 然后再同步就行

---

欢迎光临 Firefly开源社区 (https://dev.t-firefly.com/)

Powered by Discuz! X3.1