Patchwork [meta-fsl-arm-extra] More changes for git fetchers

login
register
mail settings
Submitter Gary Thomas
Date Dec. 10, 2013, 4:50 p.m.
Message ID <1386694232-19767-1-git-send-email-gary@mlbassoc.com>
Download mbox | patch
Permalink /patch/63159/
State Superseded
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - Dec. 10, 2013, 4:50 p.m.
Recipes now need to explicitly mention the branch used for git repositories.
These changes reflect this, allowing for the branch to be overridden by
.bbappend files

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
 recipes-bsp/u-boot/u-boot-boundary_git.bb        |    3 ++-
 recipes-bsp/u-boot/u-boot-script-boundary_git.bb |    3 ++-
 recipes-kernel/linux/linux-boundary_3.0.35.bb    |    4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)
Otavio Salvador - Dec. 11, 2013, 10:14 a.m.
Hello,

On Tue, Dec 10, 2013 at 2:50 PM, Gary Thomas <gary@mlbassoc.com> wrote:
> Recipes now need to explicitly mention the branch used for git repositories.
> These changes reflect this, allowing for the branch to be overridden by
> .bbappend files
>
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>

I opted to apply Philip changes (in its last revision which included
SRCBRANCH) as it were split in several commits and with a specific
commit log for each, which is more in line on how we do the commit
logs usually.

Please check if anything is missing at your side and let me know.
Gary Thomas - Dec. 11, 2013, 11:14 a.m.
On 2013-12-11 03:14, Otavio Salvador wrote:
> Hello,
>
> On Tue, Dec 10, 2013 at 2:50 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>> Recipes now need to explicitly mention the branch used for git repositories.
>> These changes reflect this, allowing for the branch to be overridden by
>> .bbappend files
>>
>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>
> I opted to apply Philip changes (in its last revision which included
> SRCBRANCH) as it were split in several commits and with a specific
> commit log for each, which is more in line on how we do the commit
> logs usually.
>
> Please check if anything is missing at your side and let me know.
>

These are all fine, thanks.

n.b. I'm not so sure about the multiple commits since they are all
for the same reason.  Splitting them up would make it harder for
someone in the future to make sure they found all the related changes
if they wanted to.  No worries.
Otavio Salvador - Dec. 11, 2013, 11:29 a.m.
On Wed, Dec 11, 2013 at 9:14 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> On 2013-12-11 03:14, Otavio Salvador wrote:
>>
>> Hello,
>>
>> On Tue, Dec 10, 2013 at 2:50 PM, Gary Thomas <gary@mlbassoc.com> wrote:
>>>
>>> Recipes now need to explicitly mention the branch used for git
>>> repositories.
>>> These changes reflect this, allowing for the branch to be overridden by
>>> .bbappend files
>>>
>>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>>
>>
>> I opted to apply Philip changes (in its last revision which included
>> SRCBRANCH) as it were split in several commits and with a specific
>> commit log for each, which is more in line on how we do the commit
>> logs usually.
>>
>> Please check if anything is missing at your side and let me know.
>>
>
> These are all fine, thanks.
>
> n.b. I'm not so sure about the multiple commits since they are all
> for the same reason.  Splitting them up would make it harder for
> someone in the future to make sure they found all the related changes
> if they wanted to.  No worries.

This is preferred so if we need to revert something we can do it in a
specific commit.

Patch

diff --git a/recipes-bsp/u-boot/u-boot-boundary_git.bb b/recipes-bsp/u-boot/u-boot-boundary_git.bb
index f612b3f..323cfdf 100644
--- a/recipes-bsp/u-boot/u-boot-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-boundary_git.bb
@@ -9,7 +9,8 @@  PROVIDES = "u-boot"
 PV = "v2013.07+git${SRCPV}"
 
 SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git"
+SRCBRANCH = "production-before-20131107"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
index 06ad438..d14e094 100644
--- a/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
+++ b/recipes-bsp/u-boot/u-boot-script-boundary_git.bb
@@ -6,7 +6,8 @@  DEPENDS = "u-boot-mkimage-native"
 PV = "v2013.01+git${SRCPV}"
 
 SRCREV = "f89bc066db0569008418fac1a0408a9a57f2232f"
-SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git"
+SRCBRANCH = "production-before-20131107"
+SRC_URI = "git://github.com/boundarydevices/u-boot-imx6.git;branch=${SRCBRANCH}"
 
 S = "${WORKDIR}/git"
 
diff --git a/recipes-kernel/linux/linux-boundary_3.0.35.bb b/recipes-kernel/linux/linux-boundary_3.0.35.bb
index 7875f93..872cab2 100644
--- a/recipes-kernel/linux/linux-boundary_3.0.35.bb
+++ b/recipes-kernel/linux/linux-boundary_3.0.35.bb
@@ -5,12 +5,12 @@  require recipes-kernel/linux/linux-imx.inc
 
 DESCRIPTION = "Linux kernel for Boundary Devices boards"
 
-SRC_URI = "git://github.com/boundarydevices/linux-imx6.git \
+SRC_URI = "git://github.com/boundarydevices/linux-imx6.git;branch=${SRCBRANCH} \
            file://defconfig"
 
 LOCALVERSION = "-4.1.0+yocto"
 SRCREV = "58099389255add7c17ce6babf37a50ce5d11d6b8"
-
+SRCBRANCH = "boundary-imx_3.0.35_4.1.0"
 
 # GPU support patches
 SRC_URI += "file://drm-vivante-Add-00-sufix-in-returned-bus-Id.patch \