[meta-freescale] [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES
Otavio Salvador
otavio at ossystems.com.br
Wed Jun 17 08:14:08 PDT 2015
Hello Gary,
On Wed, Jun 17, 2015 at 12:01 PM, Gary Thomas <samoht.yrag at gmail.com> wrote:
> On 2015-06-17 08:56, Fabio Estevam wrote:
>>
>> On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas <gary at mlbassoc.com> wrote:
>>
>>> I'm still confused - it applies just fine for me:
>>>
>>> gthomas at Zeus:/tmp$ git clone git://git.yoctoproject.org/meta-fsl-arm
>>> Cloning into 'meta-fsl-arm'...
>>> remote: Counting objects: 10025, done.
>>> remote: Compressing objects: 100% (3426/3426), done.
>>> remote: Total 10025 (delta 6192), reused 10014 (delta 6181)
>>> Receiving objects: 100% (10025/10025), 37.81 MiB | 1.39 MiB/s, done.
>>> Resolving deltas: 100% (6192/6192), done.
>>> Checking connectivity... done.
>>> gthomas at Zeus:/tmp$ cd meta-fsl-arm
>>> gthomas at Zeus:/tmp/meta-fsl-arm$ git am
>>> </tmp/0001-imx-gpu-viv-Avoid-duplicate-values-in-PROVIDES.patch
>>> Applying: imx-gpu-viv: Avoid duplicate values in PROVIDES
>>>
>>> What am I doing differently from you?
>>
>>
>> I think you missed to change the branch to master.
>
>
> The checkout defaults to master:
>
> gthomas at Zeus:/tmp/meta-fsl-arm$ git branch -a
> * master
> remotes/origin/1.4_M3
> remotes/origin/1.4_M5
> remotes/origin/HEAD -> origin/master
> remotes/origin/daisy
> remotes/origin/danny
> remotes/origin/danny-next
> remotes/origin/denzil
> remotes/origin/dizzy
> remotes/origin/dizzy-next
> remotes/origin/dora
> remotes/origin/dora-next
> remotes/origin/dylan
> remotes/origin/dylan-next
> remotes/origin/fido
> remotes/origin/master
> remotes/origin/master-next
>
>> Your patch also fails for me when I try to apply it.
>
>
> There's something strange going on here... Is your tree the
> same as mine (I checked it out directly - I don't use the BSP
> setup scripts/repo)
> git://git.yoctoproject.org/meta-fsl-arm
The patchfile might have been corrupted; please attach the file for me to try.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
More information about the meta-freescale
mailing list