From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.windriver.com ([147.11.1.11]) by linuxtogo.org with esmtp (Exim 4.72) (envelope-from ) id 1SmRbh-0006gZ-5N for openembedded-core@lists.openembedded.org; Wed, 04 Jul 2012 17:35:14 +0200 Received: from ALA-HCA.corp.ad.wrs.com (ala-hca [147.11.189.40]) by mail.windriver.com (8.14.3/8.14.3) with ESMTP id q64FNwxd021735 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=FAIL); Wed, 4 Jul 2012 08:24:03 -0700 (PDT) Received: from yow-pgortmak-d2.corp.ad.wrs.com (128.224.146.165) by ALA-HCA.corp.ad.wrs.com (147.11.189.50) with Microsoft SMTP Server id 14.1.255.0; Wed, 4 Jul 2012 08:23:59 -0700 From: Paul Gortmaker To: Date: Wed, 4 Jul 2012 11:23:45 -0400 Message-ID: <1341415425-16073-1-git-send-email-paul.gortmaker@windriver.com> X-Mailer: git-send-email 1.7.9.6 In-Reply-To: <4FF33085.1070703@linux.intel.com> References: <4FF33085.1070703@linux.intel.com> MIME-Version: 1.0 Subject: [PATCH] u-boot: make FILESDIR a shared setting via FILESPATH X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.11 Precedence: list Reply-To: Patches and discussions about the oe-core layer List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 04 Jul 2012 15:35:14 -0000 Content-Type: text/plain The setting is the same in all recipes, so move it to the shared settings in u-boot.inc Since FILESDIR is also being phased out, use the FILESPATH setting as suggested by Richard Purdie. Cc: Richard Purdie Signed-off-by: Paul Gortmaker --- [ PG: Retested builds for 8315 and beagleboard ] meta/recipes-bsp/u-boot/u-boot.inc | 1 + meta/recipes-bsp/u-boot/u-boot_2011.03.bb | 2 -- meta/recipes-bsp/u-boot/u-boot_2011.06.bb | 2 -- meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb | 2 -- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 5de3583..664c2e6 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -59,6 +59,7 @@ do_install () { } FILES_${PN} = "/boot" +FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:" do_deploy () { install -d ${DEPLOYDIR} diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb index e99bc2c..ed38f54 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb @@ -10,8 +10,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ file://README;beginline=1;endline=22;md5=3a00ef51d3fc96e9d6c1bc4708ccd3b5" -FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" - # This revision corresponds to the tag "v2011.03" # We use the revision in order to avoid having to fetch it from the repo during parse SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca" diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb index 680401f..da61852 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb @@ -10,8 +10,6 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb \ file://README;beginline=1;endline=22;md5=5ba4218ac89af7846802d0348df3fb90" -FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" - # This revision corresponds to the tag "v2011.06" # We use the revision in order to avoid having to fetch it from the repo during parse SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a" diff --git a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb b/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb index dbdc663..25cc8c9 100644 --- a/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb +++ b/meta/recipes-bsp/u-boot/u-boot_2012.04.01.bb @@ -14,8 +14,6 @@ DEFAULT_PREFERENCE = "-1" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb" -FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}" - # This revision corresponds to the tag "v2012.04.01" # We use the revision in order to avoid having to fetch it from the # repo during parse -- 1.7.9.6