From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by yocto-www.yoctoproject.org (Postfix, from userid 118) id 630D0E00A54; Wed, 17 Jun 2015 08:12:28 -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=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 X-Spam-HAM-Report: * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider * (picmaster[at]mail.bg) * -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low * trust * [193.201.172.118 listed in list.dnswl.org] * -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% * [score: 0.0000] * -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's * domain * 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily * valid * -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Received: from mx2.mail.bg (mx2.mail.bg [193.201.172.118]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id C4022E00998 for ; Wed, 17 Jun 2015 08:12:10 -0700 (PDT) Received: from [192.168.0.62] (unknown [93.152.143.60]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx2.mail.bg (Postfix) with ESMTPSA id 44B356003874; Wed, 17 Jun 2015 18:12:07 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=mail.bg; s=default; t=1434553927; bh=3JLVuK5WnPjlAK/4ASNenxFrz5AKOG641DqDDQ4oZBc=; h=Message-ID:Date:From:MIME-Version:To:Subject:References: In-Reply-To:Content-Type:Content-Transfer-Encoding; b=SXg10dlbS0p/XvA4FE1cUY9P7YXl5TC0RX50VdU5P0G85xHMDhZ8dEvgKhDEXDOkC Bpxh3bl6znemQL4oRWD4UMtJzLyrR6//5+at4gFWv9frJeB+wzT3kx3FTFB/8emfAN VOP6SxhYcyMEP9FytQuG9QqOyqe5HvJvicFzVd7A= Message-ID: <55818E47.80001@mail.bg> Date: Wed, 17 Jun 2015 18:12:07 +0300 From: Nikolay Dimitrov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Icedove/31.7.0 MIME-Version: 1.0 To: Gary Thomas , meta-freescale@yoctoproject.org 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: <55818BDB.8050305@gmail.com> 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:12:28 -0000 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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 >> 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 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