Patches due to bitbake changes

Submitted by danismostlikely@gmail.com on Dec. 6, 2013, 5:23 p.m.

Details

Message ID CACS+7ZTVc52s8ZBjrY6UfOYO=VUOc0+1N119u9MGvEpgPVRJ2g@mail.gmail.com
State Not Applicable, archived
Delegated to: Otavio Salvador
Headers show

Commit Message

danismostlikely@gmail.com Dec. 6, 2013, 5:23 p.m.
As of bitbake revision a9112a102a89049cda597dad449e922c9e957a5d the git
fetcher checks for the SRCREV in the branch given to the fetcher. That is
master by default. These three recipes didn't specify the branch containing
the SRCREV, so the fetcher failed even though the revision exists. These
patches fix that for linux-wandboard in meta-fsl-arm-extra, and for
u-boot-fslc in meta-fsl-arm.

Similar problems probably exist in other kernel and u-boot recipes, but
since I only have a Wandboard, I didn't test those.

Thanks.

Dan

Patch hide | download patch | download mbox

From 84b12ed13ecaec5d95a089c858b718311f09c949 Mon Sep 17 00:00:00 2001
From: Dan McGregor <dan.mcgregor@usask.ca>
Date: Fri, 6 Dec 2013 11:12:43 -0600
Subject: [meta-fsl-arm][PATCH 2/2] linux-fslc: Add tag to git SRC_URI

Similar to u-boot-fslc, specify the branch to check for SRC_URI.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 recipes-kernel/linux/linux-fslc.inc     | 4 +++-
 recipes-kernel/linux/linux-fslc_3.12.bb | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/recipes-kernel/linux/linux-fslc.inc b/recipes-kernel/linux/linux-fslc.inc
index 378c66b..c0f2caa 100644
--- a/recipes-kernel/linux/linux-fslc.inc
+++ b/recipes-kernel/linux/linux-fslc.inc
@@ -12,6 +12,8 @@  inherit kernel
 require recipes-kernel/linux/linux-imx.inc
 require recipes-kernel/linux/linux-dtb.inc
 
-SRC_URI = "git://github.com/Freescale/linux-mainline.git \
+BRANCH ??= "master"
+
+SRC_URI = "git://github.com/Freescale/linux-mainline.git;branch=${BRANCH} \
            file://defconfig"
 LOCALVERSION = "-fslc"
diff --git a/recipes-kernel/linux/linux-fslc_3.12.bb b/recipes-kernel/linux/linux-fslc_3.12.bb
index 100aaf2..6da185e 100644
--- a/recipes-kernel/linux/linux-fslc_3.12.bb
+++ b/recipes-kernel/linux/linux-fslc_3.12.bb
@@ -6,6 +6,7 @@  include linux-fslc.inc
 PV = "3.12+git${SRCPV}"
 
 # patches-3.12
+BRANCH = "patches-3.12"
 SRCREV = "9ab58339c5e84c34df82f8a2f68b8b033b9bd03f"
 
 COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6)"
-- 
1.8.4.2


Comments

Gary Thomas Dec. 6, 2013, 5:28 p.m.
On 2013-12-06 10:23, Dan McGregor wrote:
> As of bitbake revision a9112a102a89049cda597dad449e922c9e957a5d the git fetcher checks for the SRCREV in the branch given to the fetcher. That is master by default. These three
> recipes didn't specify the branch containing the SRCREV, so the fetcher failed even though the revision exists. These patches fix that for linux-wandboard in meta-fsl-arm-extra,
> and for u-boot-fslc in meta-fsl-arm.
>
> Similar problems probably exist in other kernel and u-boot recipes, but since I only have a Wandboard, I didn't test those.
>

Why didn't you make the branch adjustable for u-boot-fslc?  I for one
use that as well, but not the same branch/rev.
John Weber Dec. 6, 2013, 5:57 p.m.

John Weber Dec. 7, 2013, 5:26 p.m.

Otavio Salvador Dec. 7, 2013, 10:27 p.m.
On Sat, Dec 7, 2013 at 3:26 PM, John Weber <rjohnweber@gmail.com> wrote:
> Hi Dan,
>
> Thanks for the patches.  I'm testing them now but I don't expect any issues.
>
> Can you please resend using git send-email?  This way the patches end up in
> patchwork nicely organized and more easily managed.  I'm sure Otavio would
> appreciate it.
>
> git send-email --to meta-freescale@yoctoproject.org <generated patch>

I second this request; Dan please resend it so we can review/apply them.