Patchwork [meta-fsl-arm] u-boot-fslc: Add branch to SRC_URI and separate recipe files

login
register
mail settings
Submitter John Weber
Date Dec. 9, 2013, 6:31 p.m.
Message ID <1386613918-32093-1-git-send-email-rjohnweber@gmail.com>
Download mbox | patch
Permalink /patch/63063/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

John Weber - Dec. 9, 2013, 6:31 p.m.
From: Dan McGregor <danismostlikely@gmail.com>

Separate the recipe into two files in the same fashion as the kernel
recipes.  A u-boot-fslc.inc file contains the common settings for the
recipe, and a .bb file contains the settings specific to the version
of u-boot to be built (e.g. SRCREV, branch name).

In addition, new versions of bitbake require that a branch be specified
and that the SRCREV be in the specified branch.  Set the branch in the
SRC_URI.

Branch code based on patch from Dan McGregor <danismostlikely@gmail.com>

Signed-off-by: John Weber <rjohnweber@gmail.com>
---
 recipes-bsp/u-boot/u-boot-fslc.inc        |   29 +++++++++++++++++++++++++++++
 recipes-bsp/u-boot/u-boot-fslc_2013.10.bb |   24 +++---------------------
 2 files changed, 32 insertions(+), 21 deletions(-)
 create mode 100644 recipes-bsp/u-boot/u-boot-fslc.inc
Gary Thomas - Dec. 10, 2013, 1:05 p.m.
On 2013-12-09 11:31, John Weber wrote:
> From: Dan McGregor <danismostlikely@gmail.com>
>
> Separate the recipe into two files in the same fashion as the kernel
> recipes.  A u-boot-fslc.inc file contains the common settings for the
> recipe, and a .bb file contains the settings specific to the version
> of u-boot to be built (e.g. SRCREV, branch name).
>
> In addition, new versions of bitbake require that a branch be specified
> and that the SRCREV be in the specified branch.  Set the branch in the
> SRC_URI.
>
> Branch code based on patch from Dan McGregor <danismostlikely@gmail.com>
>
> Signed-off-by: John Weber <rjohnweber@gmail.com>
> ---
>   recipes-bsp/u-boot/u-boot-fslc.inc        |   29 +++++++++++++++++++++++++++++
>   recipes-bsp/u-boot/u-boot-fslc_2013.10.bb |   24 +++---------------------
>   2 files changed, 32 insertions(+), 21 deletions(-)
>   create mode 100644 recipes-bsp/u-boot/u-boot-fslc.inc
>
> diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
> new file mode 100644
> index 0000000..8457bc5
> --- /dev/null
> +++ b/recipes-bsp/u-boot/u-boot-fslc.inc
> @@ -0,0 +1,29 @@
> +# Copyright (C) 2012, 2013 O.S. Systems Software LTDA.
> +# Released under the MIT license (see COPYING.MIT for the terms)
> +
> +require recipes-bsp/u-boot/u-boot.inc
> +
> +DESCRIPTION = "U-boot bootloader for Freescale ARM platforms"
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
> +COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
> +
> +DEPENDS_mxs += "elftosb-native openssl-native"
> +
> +PROVIDES += "u-boot"
> +
> +GITBRANCH ??= "master"
> +
> +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;tag=${BITBRANCH}"

Don't use tag=, use branch=.  The use of tags breaks the ability to run
with BB_NO_NETWORK and private/local source mirrors.

Also, why not call it SRCBRANCH, following the revision name of SRCREV already
used by bitbake?

> +
> +S = "${WORKDIR}/git"
> +
> +# FIXME: Allow linking of 'tools' binaries with native libraries
> +#        used for generating the boot logo and other tools used
> +#        during the build process.
> +EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
> +                 HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \
> +                 HOSTSTRIP=true'
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
> +
> 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..d074997 100644
> --- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> +++ b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
> @@ -1,25 +1,7 @@
> -require recipes-bsp/u-boot/u-boot.inc
> -
> -LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
> -COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
> -
> -DEPENDS_mxs += "elftosb-native openssl-native"
> -
> -PROVIDES += "u-boot"
> +include u-boot-fslc.inc
>
>   PV = "v2013.10"
>
> -SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
> -SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
> +GITBRANCH = "patches-2013.10"
>
> -S = "${WORKDIR}/git"
> -
> -# FIXME: Allow linking of 'tools' binaries with native libraries
> -#        used for generating the boot logo and other tools used
> -#        during the build process.
> -EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
> -                 HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \
> -                 HOSTSTRIP=true'
> -
> -PACKAGE_ARCH = "${MACHINE_ARCH}"
> +SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
>
Otavio Salvador - Dec. 10, 2013, 2:25 p.m.
On Tue, Dec 10, 2013 at 11:05 AM, Gary Thomas <gary@mlbassoc.com> wrote:
> On 2013-12-09 11:31, John Weber wrote:
>>
>> From: Dan McGregor <danismostlikely@gmail.com>
>>
>> Separate the recipe into two files in the same fashion as the kernel
>> recipes.  A u-boot-fslc.inc file contains the common settings for the
>> recipe, and a .bb file contains the settings specific to the version
>> of u-boot to be built (e.g. SRCREV, branch name).
>>
>> In addition, new versions of bitbake require that a branch be specified
>> and that the SRCREV be in the specified branch.  Set the branch in the
>> SRC_URI.
>>
>> Branch code based on patch from Dan McGregor <danismostlikely@gmail.com>
>>
>> Signed-off-by: John Weber <rjohnweber@gmail.com>
>> ---
>>   recipes-bsp/u-boot/u-boot-fslc.inc        |   29
>> +++++++++++++++++++++++++++++
>>   recipes-bsp/u-boot/u-boot-fslc_2013.10.bb |   24
>> +++---------------------
>>   2 files changed, 32 insertions(+), 21 deletions(-)
>>   create mode 100644 recipes-bsp/u-boot/u-boot-fslc.inc
>>
>> diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc
>> b/recipes-bsp/u-boot/u-boot-fslc.inc
>> new file mode 100644
>> index 0000000..8457bc5
>> --- /dev/null
>> +++ b/recipes-bsp/u-boot/u-boot-fslc.inc
>> @@ -0,0 +1,29 @@
>> +# Copyright (C) 2012, 2013 O.S. Systems Software LTDA.
>> +# Released under the MIT license (see COPYING.MIT for the terms)
>> +
>> +require recipes-bsp/u-boot/u-boot.inc
>> +
>> +DESCRIPTION = "U-boot bootloader for Freescale ARM platforms"
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM =
>> "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
>> +COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
>> +
>> +DEPENDS_mxs += "elftosb-native openssl-native"
>> +
>> +PROVIDES += "u-boot"
>> +
>> +GITBRANCH ??= "master"
>> +
>> +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;tag=${BITBRANCH}"
>
>
> Don't use tag=, use branch=.  The use of tags breaks the ability to run
> with BB_NO_NETWORK and private/local source mirrors.
>
> Also, why not call it SRCBRANCH, following the revision name of SRCREV
> already
> used by bitbake?

I second this changes; John, can you update this accordinly?
John Weber - Dec. 10, 2013, 2:47 p.m.
On 12/10/13 8:25 AM, Otavio Salvador wrote:
> On Tue, Dec 10, 2013 at 11:05 AM, Gary Thomas <gary@mlbassoc.com> wrote:
>> On 2013-12-09 11:31, John Weber wrote:
>>> From: Dan McGregor <danismostlikely@gmail.com>
>>>
>>> Separate the recipe into two files in the same fashion as the kernel
>>> recipes.  A u-boot-fslc.inc file contains the common settings for the
>>> recipe, and a .bb file contains the settings specific to the version
>>> of u-boot to be built (e.g. SRCREV, branch name).
>>>
>>> In addition, new versions of bitbake require that a branch be specified
>>> and that the SRCREV be in the specified branch.  Set the branch in the
>>> SRC_URI.
>>>
>>> Branch code based on patch from Dan McGregor <danismostlikely@gmail.com>
>>>
>>> Signed-off-by: John Weber <rjohnweber@gmail.com>
>>> ---
>>>    recipes-bsp/u-boot/u-boot-fslc.inc        |   29
>>> +++++++++++++++++++++++++++++
>>>    recipes-bsp/u-boot/u-boot-fslc_2013.10.bb |   24
>>> +++---------------------
>>>    2 files changed, 32 insertions(+), 21 deletions(-)
>>>    create mode 100644 recipes-bsp/u-boot/u-boot-fslc.inc
>>>
>>> diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc
>>> b/recipes-bsp/u-boot/u-boot-fslc.inc
>>> new file mode 100644
>>> index 0000000..8457bc5
>>> --- /dev/null
>>> +++ b/recipes-bsp/u-boot/u-boot-fslc.inc
>>> @@ -0,0 +1,29 @@
>>> +# Copyright (C) 2012, 2013 O.S. Systems Software LTDA.
>>> +# Released under the MIT license (see COPYING.MIT for the terms)
>>> +
>>> +require recipes-bsp/u-boot/u-boot.inc
>>> +
>>> +DESCRIPTION = "U-boot bootloader for Freescale ARM platforms"
>>> +LICENSE = "GPLv2+"
>>> +LIC_FILES_CHKSUM =
>>> "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
>>> +COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
>>> +
>>> +DEPENDS_mxs += "elftosb-native openssl-native"
>>> +
>>> +PROVIDES += "u-boot"
>>> +
>>> +GITBRANCH ??= "master"
>>> +
>>> +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;tag=${BITBRANCH}"
>>
>> Don't use tag=, use branch=.  The use of tags breaks the ability to run
>> with BB_NO_NETWORK and private/local source mirrors.
>>
>> Also, why not call it SRCBRANCH, following the revision name of SRCREV
>> already
>> used by bitbake?
> I second this changes; John, can you update this accordinly?
>
v3 is sent.

Patch

diff --git a/recipes-bsp/u-boot/u-boot-fslc.inc b/recipes-bsp/u-boot/u-boot-fslc.inc
new file mode 100644
index 0000000..8457bc5
--- /dev/null
+++ b/recipes-bsp/u-boot/u-boot-fslc.inc
@@ -0,0 +1,29 @@ 
+# Copyright (C) 2012, 2013 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+require recipes-bsp/u-boot/u-boot.inc
+
+DESCRIPTION = "U-boot bootloader for Freescale ARM platforms"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
+
+DEPENDS_mxs += "elftosb-native openssl-native"
+
+PROVIDES += "u-boot"
+
+GITBRANCH ??= "master"
+
+SRC_URI = "git://github.com/Freescale/u-boot-imx.git;tag=${BITBRANCH}"
+
+S = "${WORKDIR}/git"
+
+# FIXME: Allow linking of 'tools' binaries with native libraries
+#        used for generating the boot logo and other tools used
+#        during the build process.
+EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
+                 HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \
+                 HOSTSTRIP=true'
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
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..d074997 100644
--- a/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
+++ b/recipes-bsp/u-boot/u-boot-fslc_2013.10.bb
@@ -1,25 +1,7 @@ 
-require recipes-bsp/u-boot/u-boot.inc
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
-COMPATIBLE_MACHINE = "(mxs|mx3|mx5|mx6|vf60)"
-
-DEPENDS_mxs += "elftosb-native openssl-native"
-
-PROVIDES += "u-boot"
+include u-boot-fslc.inc
 
 PV = "v2013.10"
 
-SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"
-SRC_URI = "git://github.com/Freescale/u-boot-imx.git"
+GITBRANCH = "patches-2013.10"
 
-S = "${WORKDIR}/git"
-
-# FIXME: Allow linking of 'tools' binaries with native libraries
-#        used for generating the boot logo and other tools used
-#        during the build process.
-EXTRA_OEMAKE += 'HOSTCC="${BUILD_CC} ${BUILD_CPPFLAGS}" \
-                 HOSTLDFLAGS="-L${STAGING_BASE_LIBDIR_NATIVE} -L${STAGING_LIBDIR_NATIVE}" \
-                 HOSTSTRIP=true'
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
+SRCREV = "079e214888279518ce061c71238a74a0c3db2c28"