From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id B4BBBE009DF; Wed, 17 Jun 2015 07:46:11 -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 11EA8E00992 for ; Wed, 17 Jun 2015 07:46:06 -0700 (PDT) Received: by mail.chez-thomas.org (Postfix, from userid 1998) id 08CE6F811E1; Wed, 17 Jun 2015 08:46:06 -0600 (MDT) Received: from [192.168.1.114] (zeus [192.168.1.114]) by mail.chez-thomas.org (Postfix) with ESMTP id 1720AF811D7; Wed, 17 Jun 2015 08:46:05 -0600 (MDT) Message-ID: <55818841.6050204@mlbassoc.com> Date: Wed, 17 Jun 2015 08:46:25 -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> 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 14:46:11 -0000 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On 2015-06-17 08:31, Otavio Salvador wrote: > On Wed, Jun 17, 2015 at 11:25 AM, Gary Thomas wrote: >> On 2015-06-17 08:06, Otavio Salvador wrote: >>> >>> On Tue, Jun 16, 2015 at 10:18 AM, Gary Thomas 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 >>> >>> >>> 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