From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id DC835E009DF; Wed, 17 Jun 2015 08:20:56 -0700 (PDT) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on yocto-www.yoctoproject.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.1 X-Spam-HAM-Report: * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] Received: from mail.chez-thomas.org (mail.mlbassoc.com [65.100.170.105]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 2693CE00992 for ; Wed, 17 Jun 2015 08:20:51 -0700 (PDT) Received: by mail.chez-thomas.org (Postfix, from userid 1998) id 5684BF811D8; Wed, 17 Jun 2015 09:20:51 -0600 (MDT) Received: from [192.168.1.114] (zeus [192.168.1.114]) by mail.chez-thomas.org (Postfix) with ESMTP id 84F6EF811D7; Wed, 17 Jun 2015 09:20:50 -0600 (MDT) Message-ID: <55819067.80200@mlbassoc.com> Date: Wed, 17 Jun 2015 09:21:11 -0600 From: Gary Thomas User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Otavio Salvador References: <1434460691-3458-1-git-send-email-gary@mlbassoc.com> <55818341.7000103@mlbassoc.com> <55818841.6050204@mlbassoc.com> <55818BDB.8050305@gmail.com> In-Reply-To: Cc: "meta-freescale@yoctoproject.org" Subject: Re: [PATCH] imx-gpu-viv: Avoid duplicate values in PROVIDES X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 17 Jun 2015 15:20:56 -0000 X-Groupsio-MsgNum: 14366 Content-Type: multipart/mixed; boundary="------------040506000108000107000308" --------------040506000108000107000308 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2015-06-17 09:14, Otavio Salvador wrote: > Hello Gary, > > On Wed, Jun 17, 2015 at 12: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 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 >>>> >>> 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 ------------------------------------------------------------ --------------040506000108000107000308 Content-Type: text/x-patch; name="0001-imx-gpu-viv-Avoid-duplicate-values-in-PROVIDES.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-imx-gpu-viv-Avoid-duplicate-values-in-PROVIDES.patch" >From 1c5df3ffd3463dcd653f6eb6d21e0547cd980e19 Mon Sep 17 00:00:00 2001 From: Gary Thomas 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 --- 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 --------------040506000108000107000308--