[yocto] Error when applying kernel patch from BSP: "Uncommited changes detected. Refresh first" error

Saxena, Rahul rahul.saxena at intel.com
Fri Aug 31 16:26:06 PDT 2012


Hi,

I am trying to apply a kernel patch from the BSP, but getting a error.

DEBUG: Executing shell function do_patch
Unstaged changes after reset:
M     .gitignore
Deleted branch meta-temp (was 580ac9c).
warning: could not find (or was already included): cfg/x86_64.scc (/home/rsaxena/YoctoWork2/rangeley3/tmp/work/rangeley-poky-linux/linux-yocto-3.4.4+git3+dab07bdc3a53b21220da3af91c5d2729b027b5a7_2+19f7e43b54aef08d58135ed2a897d77b624b320a-r3/linux/meta/cfg/kernel-cache/bsp/common-pc-64)
[INFO] validating against known patches  (rangeley-standard-meta)
  [                                                  ] (|)(1 %)
  [#                                                 ] (/)(2 %)
  [#                                                 ] (-)(3 %)
  [##                                                ] (\)(4 %)
  [##                                                ] (|)(5 %)
  [###                                               ] (/)(6 %)

--
[############################################      ] (/)(89 %)
  [#############################################     ] (-)(90 %)
Uncommited changes detected. Refresh first.
[ERROR] unable to complete push
pending patches are:
links/linux-yocto/msi.patch
ERROR. could not update git tree
ERROR. Could not modify standard/common-pc-64/rangeley
ERROR: Function failed: do_patch (see /home/rsaxena/YoctoWork2/rangeley3/tmp/work/rangeley-poky-linux/linux-yocto-3.4.4+git3+dab07bdc3a53b21220da3af91c5d2729b027b5a7_2+19f7e43b54aef08d58135ed2a897d77b624b320a-r3/temp/log.do_patch.39386 for further information)

My linux-yocto_3.4.bbappend file has the statements:
SRC_URI +="file://patchlist.scc"
SRC_URI +="file://my_rangeley.cfg"
COMPATIBLE_MACHINE_rangeley = "rangeley"

KMACHINE_rangeley  = "rangeley"
KBRANCH_rangeley  = "standard/common-pc-64/rangeley"
SRCREV_machine_pn-linux-yocto_rangeley ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
SRCREV_meta_pn-linux-yocto_rangeley ?= "dab07bdc3a53b21220da3af91c5d2729b027b5a7"

cat  linux-yocto/patchlist.scc

patch msi.patch

I am using the master branch of poky.

What is the meaning of the ERROR messages above ?
Any suggestions would be greatly appreciated.

Thanks
Rahul
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.yoctoproject.org/pipermail/yocto/attachments/20120831/be8d6d4a/attachment.html>


More information about the yocto mailing list