u-boot-fslc: Add branch to SRC_URI and separate recipe files
PATCH 1/1 u-boot-fslc: Add branch to SRC_URI and separate recipe files
From: Dan McGregor <[email protected]>
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 <[email protected]>
--- 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
recipes-bsp/u-boot/u-boot-fslc.inc new file +29 -0
@@ -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}" +
recipes-bsp/u-boot/u-boot-fslc_2013.10.bb +3 -21
@@ -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"
Signature · 1 line
1.7.9.5
Quoted 33 lines · John Weber
From: Dan McGregor <[email protected]>
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 <[email protected]>
Signed-off-by John Weber <[email protected]>--- 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
recipes-bsp/u-boot/u-boot-fslc.inc new file +7
-0@@ -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+"
recipes-bsp/u-boot/u-boot-fslc.inc line 17
Quoted 10 lines
recipes-bsp/u-boot/u-boot-fslc.inc new file +10
-0+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?
Quoted 46 lines
recipes-bsp/u-boot/u-boot-fslc.inc new file +12
-0+ +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}" +recipes-bsp/u-boot/u-boot-fslc_2013.10.bb +3
-21@@ -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"
Signature · 4 lines
------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------
Quoted 54 lines · Gary Thomas
Quoted 39 lines · John Weber
From: Dan McGregor <[email protected]>
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 <[email protected]>
Signed-off-by John Weber <[email protected]>--- 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
recipes-bsp/u-boot/u-boot-fslc.inc new file +8
-0@@ -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"
recipes-bsp/u-boot/u-boot-fslc.inc line 17
Quoted 9 lines
recipes-bsp/u-boot/u-boot-fslc.inc new file +9
-0+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_NETWORKand private/local source mirrors.
Quoted 3 lines
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?
Signature · 3 lines
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
Quoted 53 lines · Otavio Salvador
Quoted 52 lines · Gary Thomas
Quoted 38 lines · John Weber
From: Dan McGregor <[email protected]>
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 <[email protected]>
Signed-off-by John Weber <[email protected]>--- 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
recipes-bsp/u-boot/u-boot-fslc.inc new file +8
-0@@ -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"
recipes-bsp/u-boot/u-boot-fslc.inc line 17
Quoted 9 lines
recipes-bsp/u-boot/u-boot-fslc.inc new file +9
-0+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_NETWORKand private/local source mirrors.
Quoted 5 lines
Quoted 3 lines
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.