[PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

Additional packages are added to the PROVIDES variable, depending on
the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc.
The old way this was being set could add multiple versions of the
same package to the PROVIDES variable which in turn can cause confusion
with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their
overrides whereas others might only have :mx6q.  With the previous
setting of PROVIDES, this package would not be sharable via sstate
between such machines.

This patch changes the process so that these extra packages are only
added once, improving the [re]usability of sstate.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index ea19292..4b6e030 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -11,11 +11,11 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamag
                              base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \
                                            '', d), d)}"
 
-PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d"
-PROVIDES_append_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-PROVIDES_append_mx6dl  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-PROVIDES_append_mx6sx  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES = ""
+EXTRA_PROVIDES_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6dl = " virtual/libgl virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6sx = " virtual/libgl virtual/libgles1 virtual/libgles2"
+PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"
 
 PE = "1"
 
-- 
1.9.1

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Otavio Salvador]

On Tue, Jun 16, 2015 at 10:18 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> Additional packages are added to the PROVIDES variable, depending on
> the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc.
> The old way this was being set could add multiple versions of the
> same package to the PROVIDES variable which in turn can cause confusion
> with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their
> overrides whereas others might only have :mx6q.  With the previous
> setting of PROVIDES, this package would not be sharable via sstate
> between such machines.
>
> This patch changes the process so that these extra packages are only
> added once, improving the [re]usability of sstate.
>
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>

The patch looks very good but it fails to apply on master; please
rebase and send a v2. While on that, please pay attention to the
README file to proper send the subject-prefix for the respective
layer.

-- 
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

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

On 2015-06-17 08:06, Otavio Salvador wrote:
> On Tue, Jun 16, 2015 at 10:18 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>> Additional packages are added to the PROVIDES variable, depending on
>> the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc.
>> The old way this was being set could add multiple versions of the
>> same package to the PROVIDES variable which in turn can cause confusion
>> with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their
>> overrides whereas others might only have :mx6q.  With the previous
>> setting of PROVIDES, this package would not be sharable via sstate
>> between such machines.
>>
>> This patch changes the process so that these extra packages are only
>> added once, improving the [re]usability of sstate.
>>
>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>
> The patch looks very good but it fails to apply on master; please
> rebase and send a v2. While on that, please pay attention to the
> README file to proper send the subject-prefix for the respective
> layer.
>

The patch was based on meta-fsl-arm master(f137cc67f8) which seems
to be the latest version.

What am I missing?

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Otavio Salvador]

On Wed, Jun 17, 2015 at 11:25 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> On 2015-06-17 08:06, Otavio Salvador wrote:
>>
>> On Tue, Jun 16, 2015 at 10:18 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>
>>> Additional packages are added to the PROVIDES variable, depending on
>>> the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc.
>>> The old way this was being set could add multiple versions of the
>>> same package to the PROVIDES variable which in turn can cause confusion
>>> with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their
>>> overrides whereas others might only have :mx6q.  With the previous
>>> setting of PROVIDES, this package would not be sharable via sstate
>>> between such machines.
>>>
>>> This patch changes the process so that these extra packages are only
>>> added once, improving the [re]usability of sstate.
>>>
>>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>>
>>
>> The patch looks very good but it fails to apply on master; please
>> rebase and send a v2. While on that, please pay attention to the
>> README file to proper send the subject-prefix for the respective
>> layer.
>>
>
> The patch was based on meta-fsl-arm master(f137cc67f8) which seems
> to be the latest version.
>
> What am I missing?

Applying: imx-gpu-viv: Avoid duplicate values in PROVIDES
Using index info to reconstruct a base tree...
error: patch failed: recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc:11
error: recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc: patch does not apply
Did you hand edit your patch?
It does not apply to blobs recorded in its index.
Cannot fall back to three-way merge.
Patch failed at 0001 imx-gpu-viv: Avoid duplicate values in PROVIDES
The copy of the patch that failed is found in:
   /home/otavio/src/yocto/sources/meta-fsl-arm/.git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

it seems to not been based on a publish hash. You might have a local
commit not merged yet. Please try to rebase and resend.

-- 
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

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

On 2015-06-17 08:31, Otavio Salvador wrote:
> On Wed, Jun 17, 2015 at 11:25 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>> On 2015-06-17 08:06, Otavio Salvador wrote:
>>>
>>> On Tue, Jun 16, 2015 at 10:18 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>>
>>>> Additional packages are added to the PROVIDES variable, depending on
>>>> the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc.
>>>> The old way this was being set could add multiple versions of the
>>>> same package to the PROVIDES variable which in turn can cause confusion
>>>> with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their
>>>> overrides whereas others might only have :mx6q.  With the previous
>>>> setting of PROVIDES, this package would not be sharable via sstate
>>>> between such machines.
>>>>
>>>> This patch changes the process so that these extra packages are only
>>>> added once, improving the [re]usability of sstate.
>>>>
>>>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>>>
>>>
>>> The patch looks very good but it fails to apply on master; please
>>> rebase and send a v2. While on that, please pay attention to the
>>> README file to proper send the subject-prefix for the respective
>>> layer.
>>>
>>
>> The patch was based on meta-fsl-arm master(f137cc67f8) which seems
>> to be the latest version.
>>
>> What am I missing?
>
> Applying: imx-gpu-viv: Avoid duplicate values in PROVIDES
> Using index info to reconstruct a base tree...
> error: patch failed: recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc:11
> error: recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc: patch does not apply
> Did you hand edit your patch?
> It does not apply to blobs recorded in its index.
> Cannot fall back to three-way merge.
> Patch failed at 0001 imx-gpu-viv: Avoid duplicate values in PROVIDES
> The copy of the patch that failed is found in:
>     /home/otavio/src/yocto/sources/meta-fsl-arm/.git/rebase-apply/patch
> When you have resolved this problem, run "git am --continue".
> If you prefer to skip this patch, run "git am --skip" instead.
> To restore the original branch and stop patching, run "git am --abort".
>
> it seems to not been based on a publish hash. You might have a local
> commit not merged yet. Please try to rebase and resend.
>

I'm still confused - it applies just fine for me:

gthomas@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@Zeus:/tmp$ cd meta-fsl-arm
gthomas@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?

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Fabio Estevam]

On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas <gary@mlbassoc.com> wrote:

> I'm still confused - it applies just fine for me:
>
> gthomas@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@Zeus:/tmp$ cd meta-fsl-arm
> gthomas@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.

Your patch also fails for me when I try to apply it.

Regards,

Fabio Estevam

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

On 2015-06-17 08:56, Fabio Estevam wrote:
> On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>
>> I'm still confused - it applies just fine for me:
>>
>> gthomas@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@Zeus:/tmp$ cd meta-fsl-arm
>> gthomas@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@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

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Fabio Estevam]

On Wed, Jun 17, 2015 at 12:01 PM, Gary Thomas <samoht.yrag@gmail.com> wrote:

> 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

Yes, top of head commit in master is:

commit 928e817c442b0771f89317289046f51c07460b0f
Author: Gary Thomas <gary@mlbassoc.com>
Date:   Mon Jun 15 08:41:33 2015 -0600

    image_types_fsl: Fix boot.img overwrite error

    Recent updates to the MSDOS tools (OE-core is now at 3.0.28) have made
    it an error to overwrite an image using mkfs.vfat:
      mkfs.vfat: file XXXX/tmp/work/nitrogen6x-poky-linux-gnueabi/network-demo-i
      mkfs.fat 3.0.28 (2015-05-16)
      WARNING: exit code 1 from a shell command.

    This patch fixes the problem by removing any old/stale images before
    trying to create the VFAT file system images.

    Change-Id: I74e02fd512b43315b29698f534192632d7780df2
    Signed-off-by: Gary Thomas <gary@mlbassoc.com>
    Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

What does git log shows for you?

You mentioned earlier commit f137cc67f8, which does not exist here.

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Nikolay Dimitrov]

Hi Gary,

On 06/17/2015 06:01 PM, Gary Thomas wrote:
> On 2015-06-17 08:56, Fabio Estevam wrote:
>> On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas <gary@mlbassoc.com>
>> wrote:
>>
>>> I'm still confused - it applies just fine for me:
>>>
>>> gthomas@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@Zeus:/tmp$ cd meta-fsl-arm
>>> gthomas@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@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

Yocto now uses Github mirror repos via https. There's a possibility that
the github mirror and yoctoproject are not synchronized (e.g. commits
haven't been pushed to the github remote).

You can compare the last commit hashes of both repos, just to be sure
that the yoctoproject's master is the same as github mirror's master.

Regards,
Nikolay

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Otavio Salvador]

Hello Gary,

On Wed, Jun 17, 2015 at 12:01 PM, Gary Thomas <samoht.yrag@gmail.com> wrote:
> On 2015-06-17 08:56, Fabio Estevam wrote:
>>
>> On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>
>>> I'm still confused - it applies just fine for me:
>>>
>>> gthomas@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@Zeus:/tmp$ cd meta-fsl-arm
>>> gthomas@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@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

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

[-- Attachment #1: Type: text/plain, Size: 2311 bytes --]

On 2015-06-17 09:14, Otavio Salvador wrote:
> Hello Gary,
>
> On Wed, Jun 17, 2015 at 12:01 PM, Gary Thomas <samoht.yrag@gmail.com> wrote:
>> On 2015-06-17 08:56, Fabio Estevam wrote:
>>>
>>> On Wed, Jun 17, 2015 at 11:46 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>
>>>> I'm still confused - it applies just fine for me:
>>>>
>>>> gthomas@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@Zeus:/tmp$ cd meta-fsl-arm
>>>> gthomas@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@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.
>

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------

[-- Attachment #2: 0001-imx-gpu-viv-Avoid-duplicate-values-in-PROVIDES.patch --]
[-- Type: text/x-patch, Size: 2244 bytes --]

From 1c5df3ffd3463dcd653f6eb6d21e0547cd980e19 Mon Sep 17 00:00:00 2001
From: Gary Thomas <gary@mlbassoc.com>
Date: Tue, 16 Jun 2015 07:08:51 -0600
Subject: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

Additional packages are added to the PROVIDES variable, depending on
the type of processor being supported, e.g. i.MX6Q, i.MX6SX, etc.
The old way this was being set could add multiple versions of the
same package to the PROVIDES variable which in turn can cause confusion
with sstate, e.g. a number of i.MX6 machines use :mx6q:mx6dl in their
overrides whereas others might only have :mx6q.  With the previous
setting of PROVIDES, this package would not be sharable via sstate
between such machines.

This patch changes the process so that these extra packages are only
added once, improving the [re]usability of sstate.

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
index ea19292..4b6e030 100644
--- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
+++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc
@@ -11,10 +11,11 @@ DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamag
                              base_contains('DISTRO_FEATURES', 'wayland', 'wayland', \
                                            '', d), d)}"
 
-PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d"
-PROVIDES_append_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-PROVIDES_append_mx6dl  = " virtual/libgl virtual/libgles1 virtual/libgles2"
-PROVIDES_append_mx6sx  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES = ""
+EXTRA_PROVIDES_mx6q  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6dl  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+EXTRA_PROVIDES_mx6sx  = " virtual/libgl virtual/libgles1 virtual/libgles2"
+PROVIDES += "virtual/wayland-egl virtual/libgal-x11 virtual/egl virtual/libopenvg virtual/libg2d ${EXTRA_PROVIDES}"
 
 PE = "1"
 
-- 
1.9.1

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

On 2015-06-17 09:11, Fabio Estevam wrote:
> On Wed, Jun 17, 2015 at 12:01 PM, Gary Thomas <samoht.yrag@gmail.com> wrote:
>
>> 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
>
> Yes, top of head commit in master is:
>
> commit 928e817c442b0771f89317289046f51c07460b0f
> Author: Gary Thomas <gary@mlbassoc.com>
> Date:   Mon Jun 15 08:41:33 2015 -0600
>
>      image_types_fsl: Fix boot.img overwrite error
>
>      Recent updates to the MSDOS tools (OE-core is now at 3.0.28) have made
>      it an error to overwrite an image using mkfs.vfat:
>        mkfs.vfat: file XXXX/tmp/work/nitrogen6x-poky-linux-gnueabi/network-demo-i
>        mkfs.fat 3.0.28 (2015-05-16)
>        WARNING: exit code 1 from a shell command.
>
>      This patch fixes the problem by removing any old/stale images before
>      trying to create the VFAT file system images.
>
>      Change-Id: I74e02fd512b43315b29698f534192632d7780df2
>      Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>      Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
>
> What does git log shows for you?

Exactly the same.

>
> You mentioned earlier commit f137cc67f8, which does not exist here.
>

I'm not sure where I got that, sorry.  I was definitely using the above
commit.

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Fabio Estevam]

On Wed, Jun 17, 2015 at 12:21 PM, Gary Thomas <gary@mlbassoc.com> wrote:

>> The patchfile might have been corrupted; please attach the file for me to

Yes, the attached file applies fine.

Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES

[Gary Thomas]

On 2015-06-17 09:24, Fabio Estevam wrote:
> On Wed, Jun 17, 2015 at 12:21 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>
>>> The patchfile might have been corrupted; please attach the file for me to
>
> Yes, the attached file applies fine.
>

Thanks for the patience - I'm not sure how the patch got corrupted :-(

-- 
------------------------------------------------------------
Gary Thomas                 |  Consulting for the
MLB Associates              |    Embedded world
------------------------------------------------------------