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

[Saxena, Rahul]

-----Original Message-----
From: Bruce Ashfield [mailto:bruce.ashfield at gmail.com] 
Sent: Friday, August 31, 2012 6:59 PM
To: Saxena, Rahul
Cc: yocto at yoctoproject.org; Hart, Darren
Subject: Re: [yocto] Error when applying kernel patch from BSP: "Uncommited changes detected. Refresh first" error

On Fri, Aug 31, 2012 at 7:26 PM, Saxena, Rahul <rahul.saxena at intel.com> wrote:
>
>
> 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+19f7e43b5
> 4aef08d58135ed2a897d77b624b320a-r3/linux/meta/cfg/kernel-cache/bsp/com
> mon-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+19f7e43b54
> aef08d58135ed2a897d77b624b320a-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 ?
It means that the patch or some other work happened in the linux source directory and hence nothing else can be applied (i.e. git stops you).

Head to your kernel source directory and do a 'git status', that'll give you some info about what has happened.

Bruce

I had done 'git status' before but apparently missed noticing the following.

'git status' shows the following:

#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   .gitignore
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	meta/


I looked at the .gitignore file. 'meta/' is missing from this file, while it exists in the actual kernel source (i.e. my local clone).  The build software seems to have modified .gitignore to remove 'meta/' for some reason.


I edited .gitignore manually to add 'meta/' and was able to run the run_do_patch.xx file to successfully apply the patch to
standard/common-pc-64/Rangeley branch.

Any idea as to why this is occurring and what should be done to prevent build system from modifying .gitignore ?

Rahul 

>
> Any suggestions would be greatly appreciated.
>
>
>
> Thanks
>
> Rahul
>
>
> _______________________________________________
> yocto mailing list
> yocto at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto
>



--
"Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end"