From 1b78904b115b50172cf82948d8a68dc3a98005ce Mon Sep 17 00:00:00 2001 From: Paul Gortmaker Date: Wed, 4 Jul 2012 11:23:45 -0400 Subject: u-boot: make FILESDIR a shared setting via FILESPATH 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 Signed-off-by: Richard Purdie --- 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(-) (limited to 'meta/recipes-bsp') diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index afc2d126e4..f794a2ac31 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -57,6 +57,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 e99bc2cab4..ed38f54eb1 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 680401f45b..da61852107 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 dbdc663ff9..25cc8c9f03 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 -- cgit 1.2.3-korg