Patches due to bitbake changes

Patches due to bitbake changes

[Dan McGregor]

[-- Attachment #1.1: Type: text/plain, Size: 544 bytes --]

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

[-- Attachment #1.2: Type: text/html, Size: 737 bytes --]

[-- Attachment #2: 0001-linux-wandboard-Add-branch-name.patch --]
[-- Type: text/x-patch, Size: 1663 bytes --]

From d78b7353b6f395df6b29960f2d04d250562ef3d9 Mon Sep 17 00:00:00 2001
From: Dan McGregor <dan.mcgregor@usask.ca>
Date: Fri, 6 Dec 2013 10:02:10 -0600
Subject: [meta-fsl-arm-extra][PATCH] linux-wandboard: Add branch name

New bitbake checks for SRCREV in the branch to be checked out.
That defaults to master, but SRCREV isn't in master. Set the
branch so bitbake doesn't die.

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

diff --git a/recipes-kernel/linux/linux-wandboard.inc b/recipes-kernel/linux/linux-wandboard.inc
index d2b743f..177ab93 100644
--- a/recipes-kernel/linux/linux-wandboard.inc
+++ b/recipes-kernel/linux/linux-wandboard.inc
@@ -11,8 +11,11 @@ require recipes-kernel/linux/linux-imx.inc
 LOCALVERSION ?= "+yocto"
 SCMVERSION ?= "y"
 
+# Branch defaults to master
+BRANCH ??= "master"
+
 # SRC_URI for wandboard kernel
-SRC_URI = "git://github.com/wandboard-org/linux.git \
+SRC_URI = "git://github.com/wandboard-org/linux.git;branch=${BRANCH} \
            file://defconfig \
 "
 
diff --git a/recipes-kernel/linux/linux-wandboard_3.0.35.bb b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
index a990556..72aeb6f 100644
--- a/recipes-kernel/linux/linux-wandboard_3.0.35.bb
+++ b/recipes-kernel/linux/linux-wandboard_3.0.35.bb
@@ -4,6 +4,7 @@
 include linux-wandboard.inc
 
 # Wandboard branch - based on 4.0.0 from Freescale git
+BRANCH = "wandboard_imx_3.0.35_4.0.0"
 SRCREV = "d35902c77a077a25e4dfedc6aac11ba49c52c586"
 LOCALVERSION = "-4.0.0-wandboard"
 
-- 
1.8.4.2


[-- Attachment #3: 0001-u-boot-fslc-Add-tag-to-git-SRC_URI.patch --]
[-- Type: text/x-patch, Size: 1003 bytes --]

From 8fb0fe13c35e86d0e2a467e72676ff4532f8ee77 Mon Sep 17 00:00:00 2001
From: Dan McGregor <dan.mcgregor@usask.ca>
Date: Fri, 6 Dec 2013 09:29:44 -0600
Subject: [meta-fsl-arm][PATCH 1/2] u-boot-fslc: Add tag to git SRC_URI

Bitbake now checks for the commit in the master branch by default.
Explicitly set the tag where the SRCREV is expected.

Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
---
 recipes-bsp/u-boot/u-boot-fslc_2013.10.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
index 73d4371..56c3265 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
@@ -11,7 +11,7 @@ PROVIDES += "u-boot"
 PV = "v2013.10"
 
 SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
-SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
+SRC_URI = "git://github.com/Freescale/u-boot-imx.git;tag=patches-2013.10"
 
 S = "${WORKDIR}/git"
 
-- 
1.8.4.2


[-- Attachment #4: 0002-linux-fslc-Add-tag-to-git-SRC_URI.patch --]
[-- Type: text/x-patch, Size: 1463 bytes --]

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

Re: Patches due to bitbake changes

[Gary Thomas]

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.

Re: Patches due to bitbake changes

[John Weber]

[-- Attachment #1: Type: text/html, Size: 1957 bytes --]

Re: Patches due to bitbake changes

[John Weber]

[-- Attachment #1: Type: text/html, Size: 2492 bytes --]

Re: Patches due to bitbake changes

[Otavio Salvador]

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.

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