From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.chez-thomas.org (mail.mlbassoc.com [65.100.170.105]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id F264EE006D2 for ; Tue, 10 Dec 2013 05:04:13 -0800 (PST) Received: by mail.chez-thomas.org (Postfix, from userid 1998) id 6E688F811E3; Tue, 10 Dec 2013 06:04:13 -0700 (MST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on hermes.chez-thomas.org X-Spam-Level: X-Spam-Status: No, score=-2.9 required=4.0 tests=ALL_TRUSTED,BAYES_00 autolearn=unavailable version=3.3.2 Received: from [192.168.1.114] (zeus [192.168.1.114]) by mail.chez-thomas.org (Postfix) with ESMTP id 115DCF811E1; Tue, 10 Dec 2013 06:04:12 -0700 (MST) Message-ID: <52A7117E.5000606@mlbassoc.com> Date: Tue, 10 Dec 2013 06:05:02 -0700 From: Gary Thomas User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.1.1 MIME-Version: 1.0 To: meta-freescale@yoctoproject.org References: <1386613918-32093-1-git-send-email-rjohnweber@gmail.com> In-Reply-To: <1386613918-32093-1-git-send-email-rjohnweber@gmail.com> Subject: Re: [meta-fsl-arm][PATCH] u-boot-fslc: Add branch to SRC_URI and separate recipe files X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Dec 2013 13:04:14 -0000 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit On 2013-12-09 11:31, John Weber wrote: > From: Dan McGregor > > 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 > > Signed-off-by: John Weber > --- > 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" > -- ------------------------------------------------------------ Gary Thomas | Consulting for the MLB Associates | Embedded world ------------------------------------------------------------