Return-Path: Received: from mail-yh0-f50.google.com (mail-yh0-f50.google.com [209.85.213.50]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id C3E39E00785 for ; Tue, 10 Dec 2013 06:46:08 -0800 (PST) Received: by mail-yh0-f50.google.com with SMTP id b6so3929425yha.37 for ; Tue, 10 Dec 2013 06:46:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=59AbhEhXDVzE7wtDincK83ntdT7629NwJvRp8UPJn2M=; b=mxygNVRda8BSvtt7vEobB3yTiwJmZzI43TUVTb8iqm8T0pOsY0IuBDbJwiTzDSjQqb OBCAo1JPOixEp2EkKi61xwrQ5DvSZyVXZBFiH8LmFsh07n2BQmRSsetre3cGe+nSL+nm 5+nFgs26WnrCNcrGv1XjKsFf8v+a5lkfATB7xoUjb61kjxamFdrWQ0SsOsVgOuBD0UF7 lZFuUioL7YICi1HaDqP1d5qavfZT0xLMTKPeBgY12fpaqNj6uTorkCVQLjh1kiHJgJ2w 7mj7hDKPBKPCcOgm7ss0LTVRKTcQvWF/tIXX5L6FhTwJJuo4iOjSdMR+Kryx/AQPrGF4 30nw== X-Received: by 10.236.100.8 with SMTP id y8mr569095yhf.128.1386686767286; Tue, 10 Dec 2013 06:46:07 -0800 (PST) Received: from localhost.localdomain ([75.76.228.60]) by mx.google.com with ESMTPSA id s21sm22677728yhk.9.2013.12.10.06.46.06 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Dec 2013 06:46:06 -0800 (PST) From: John Weber To: meta-freescale@yoctoproject.org Date: Tue, 10 Dec 2013 08:45:34 -0600 Message-Id: <1386686734-28918-1-git-send-email-rjohnweber@gmail.com> X-Mailer: git-send-email 1.7.9.5 Subject: [meta-fsl-arm][PATCH v3] 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 14:46:10 -0000 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 v3: Corrected SRC_URI to use branch instead of tag, and changed branch variable name to SRCBRANCH 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..485c252 --- /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" + +SRCBRANCH ??= "master" + +SRC_URI = "git://github.com/Freescale/u-boot-imx.git;branch=${SRCBRANCH}" + +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..ea42c74 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" +SRCBRANCH = "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" -- 1.7.9.5