repo sync: error: sources/poky/: contains uncommitted changes===>git status git add .

cbh@cbh:scripts$ cd /home/cbh/yocto_rootfs_builder/fsl-community-bsp/
cbh@cbh:fsl-community-bsp$ repo sync

... A new repo command ( 1.21) is available.
... You should upgrade soon:

    cp /home/cbh/yocto_rootfs_builder/fsl-community-bsp/.repo/repo/repo /home/cbh/bin/repo

Fetching project repo
Fetching project meta-fsl-demos
Fetching project poky
Fetching project meta-fsl-arm
remote: Counting objects: 11, done.
remote: Compressing objects: 100% (11/11), done.
remote: Total 11 (delta 2), reused 2 (delta 0)
Unpacking objects: 100% (11/11), done.
From git://github.com/Freescale/meta-fsl-demos
   4a925bf..27fdb2f  master     -> freescale/master
   4a925bf..27fdb2f  master-next -> freescale/master-next
remote: Counting objects: 50, done.
remote: Compressing objects: 100% (26/26), done.
remote: Total 30 (delta 18), reused 15 (delta 3)
Unpacking objects: 100% (30/30), done.
From git://git.yoctoproject.org/meta-fsl-arm
   d4316fa..fc8bcfa  master     -> yocto/master
   b6eb4bf..bf431b0  master-next -> yocto/master-next
Fetching projects:  14% (1/7)  Fetching project meta-openembedded
Fetching projects:  28% (2/7)  Fetching project meta-fsl-arm-extra
From git://github.com/Freescale/meta-fsl-arm-extra
   df32339..9481991  master-next -> freescale/master-next
Fetching projects:  42% (3/7)  Fetching project fsl-community-bsp-base
remote: Counting objects: 6, done.
remote: Compressing objects: 100% (5/5), done.
remote: Total 6 (delta 3), reused 2 (delta 1)
Unpacking objects: 100% (6/6), done.
From git://github.com/Freescale/fsl-community-bsp-base
   6bc2400..f2026cd  dora       -> freescale/dora
   2bb1dba..62c4990  master     -> freescale/master
Fetching projects:  57% (4/7)  remote: Counting objects: 1587, done.
remote: Compressing objects: 100% (655/655), done.
remote: Counting objects: 2962, done.
remote: Compressing objects: 100% (617/617), done.
remote: Total 991 (delta 642), reused 520 (delta 309)
Receiving objects: 100% (991/991), 163.27 KiB | 37 KiB/s, done.
Resolving deltas: 100% (642/642), completed with 117 local objects.
From git://git.openembedded.org/meta-openembedded6 KiB/s   
   40e0f37..ee17367  dora       -> oe/dora
   cb18201..70ebe86  dylan      -> oe/dylan
   477ccd8..ee6f88f  master     -> oe/master
 + 7577608...39fb413 master-next -> oe/master-next  (forced update)
error: The requested URL returned error: 406 while accessing https://gerrit.googlesource.com/git-repo/info/refs
fatal: HTTP request failed
remote: Finding sources: 100% (19/19)
remote: Total 19 (delta 2), reused 19 (delta 2)
Unpacking objects: 100% (19/19), done.
From https://gerrit.googlesource.com/git-repo
   26c45a7..544e7b0  master     -> origin/master
remote: Total 1826 (delta 1410), reused 1562 (delta 1179)
Receiving objects: 100% (1826/1826), 504.21 KiB, done.
Resolving deltas: 100% (1410/1410), completed with 364 local objects.
From git://git.yoctoproject.org/poky
 * [new branch]      daisy      -> yocto/daisy
   98bd952..50e9ccb  dora       -> yocto/dora
   1d4bae3..2f020ec  dylan      -> yocto/dylan
   8f683bf..3be0213  master     -> yocto/master
 + ae98224...c5b9774 master-next -> yocto/master-next  (forced update)
 * [new tag]         daisy-11.0.0 -> daisy-11.0.0
Fetching projects: 100% (7/7), done.  
Syncing work tree: 100% (6/6), done.  

error: sources/poky/: contains uncommitted changes
project sources/base/
Updating 6bc2400..f2026cd
Fast-forward
 setup-environment |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

project sources/meta-openembedded/
Updating 40e0f37..ee17367
Fast-forward
 meta-oe/recipes-devtools/cloud9/cloud9_0.6.bb      |    4 ++--
 ...sh-completion_2.0.bb => bash-completion_2.1.bb} |   15 ++++++++++++---
 2 files changed, 14 insertions(+), 5 deletions(-)
 rename meta-oe/recipes-support/bash-completion/{bash-completion_2.0.bb => bash-completion_2.1.bb} (66%)

cbh@cbh:fsl-community-bsp$ repo sync

... A new repo command ( 1.21) is available.
... You should upgrade soon:

    cp /home/cbh/yocto_rootfs_builder/fsl-community-bsp/.repo/repo/repo /home/cbh/bin/repo

Fetching project fsl-community-bsp-base
Fetching project meta-fsl-demos
Fetching project poky
Fetching project meta-fsl-arm
Fetching projects:  16% (1/6)  Fetching project meta-openembedded
Fetching projects:  33% (2/6)  Fetching project meta-fsl-arm-extra
Fetching projects: 100% (6/6), done.  

error: sources/poky/: contains uncommitted changes
cbh@cbh:fsl-community-bsp$
cbh@cbh:fsl-community-bsp$ cd sources/poky/
cbh@cbh:poky$ git
git                 gitk                git-receive-pack    git-shell           git-upload-archive  git-upload-pack     
cbh@cbh:poky$ git status
# On branch adv-imx6-branch
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#    modified:   meta-yocto/conf/distro/poky.conf
#
no changes added to commit (use "git add" and/or "git commit -a")
cbh@cbh:poky$ git add
Nothing specified, nothing added.
Maybe you wanted to say 'git add .'?
cbh@cbh:poky$ git add .
cbh@cbh:poky$ cd ../../..
cbh@cbh:yocto_rootfs_builder$ cd fsl-community-bsp/
cbh@cbh:fsl-community-bsp$ repo sync

... A new repo command ( 1.21) is available.
... You should upgrade soon:

    cp /home/cbh/yocto_rootfs_builder/fsl-community-bsp/.repo/repo/repo /home/cbh/bin/repo

Fetching project fsl-community-bsp-base
Fetching project meta-fsl-demos
Fetching project poky
Fetching project meta-fsl-arm
Fetching projects:  16% (1/6)  Fetching project meta-openembedded
Fetching projects:  33% (2/6)  Fetching project meta-fsl-arm-extra
Fetching projects: 100% (6/6), done.  

project sources/poky/
Updating f1276b0..50e9ccb
Fast-forward
 bitbake/lib/bb/fetch2/git.py                       |    4 +-
 meta/classes/image.bbclass                         |    2 +-
 meta/classes/kernel.bbclass                        |    7 +-
 meta/lib/oe/buildhistory_analysis.py               |    2 +-
 meta/lib/oe/sstatesig.py                           |    6 +-
 ...DTLS-retransmission-from-previous-session.patch |   81 +++++
 ...or-TLS-record-tampering-bug-CVE-2013-4353.patch |   31 ++
 ...e-version-in-SSL_METHOD-not-SSL-structure.patch |   33 ++
 .../openssl/openssl-1.0.1e/CVE-2014-0160.patch     |  118 +++++++
 .../recipes-connectivity/openssl/openssl_1.0.1e.bb |    6 +-
 .../ppc-fix-time-related-syscalls.patch            |  227 +++++++++++++
 meta/recipes-core/eglibc/eglibc_2.18.bb            |    1 +
 ...01-Add-MESA_EGL_NO_X11_HEADERS-to-defines.patch |   41 +++
 ...ate-NativeDisplayType-depending-on-config.patch |  359 --------------------
 meta/recipes-graphics/mesa/mesa_9.1.6.bb           |   12 +-
 meta/recipes-graphics/mesa/mesa_git.bb             |   12 +-
 16 files changed, 572 insertions(+), 370 deletions(-)
 create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Fix-DTLS-retransmission-from-previous-session.patch
 create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Fix-for-TLS-record-tampering-bug-CVE-2013-4353.patch
 create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.1e/0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch
 create mode 100644 meta/recipes-connectivity/openssl/openssl-1.0.1e/CVE-2014-0160.patch
 create mode 100644 meta/recipes-core/eglibc/eglibc-2.18/ppc-fix-time-related-syscalls.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa/0001-Add-MESA_EGL_NO_X11_HEADERS-to-defines.patch
 delete mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch

cbh@cbh:fsl-community-bsp$ cd sources/poky/
cbh@cbh:poky$ git
git                 gitk                git-receive-pack    git-shell           git-upload-archive  git-upload-pack     
cbh@cbh:poky$ gitk
cbh@cbh:poky$ git status
# On branch adv-imx6-branch
nothing to commit (working directory clean)
cbh@cbh:poky$ git add .
cbh@cbh:poky$ cd ../../..
cbh@cbh:yocto_rootfs_builder$ cd fsl-community-bsp/
cbh@cbh:fsl-community-bsp$ repo sync

... A new repo command ( 1.21) is available.
... You should upgrade soon:

    cp /home/cbh/yocto_rootfs_builder/fsl-community-bsp/.repo/repo/repo /home/cbh/bin/repo

Fetching project fsl-community-bsp-base
Fetching project meta-fsl-demos
Fetching project poky
Fetching project meta-fsl-arm
Fetching projects:  16% (1/6)  Fetching project meta-openembedded
Fetching projects:  33% (2/6)  Fetching project meta-fsl-arm-extra
Fetching projects: 100% (6/6), done.  

cbh@cbh:fsl-community-bsp$


评论
添加红包

请填写红包祝福语或标题

红包个数最小为10个

红包金额最低5元

当前余额3.43前往充值 >
需支付:10.00
成就一亿技术人!
领取后你会自动成为博主和红包主的粉丝 规则
hope_wisdom
发出的红包
实付
使用余额支付
点击重新获取
扫码支付
钱包余额 0

抵扣说明:

1.余额是钱包充值的虚拟货币,按照1:1的比例进行支付金额的抵扣。
2.余额无法直接购买下载,可以购买VIP、付费专栏及课程。

余额充值