| Submitter | Paul Gortmaker |
|---|---|
| Date | July 2, 2012, 5:44 a.m. |
| Message ID | <1341207885-9463-3-git-send-email-paul.gortmaker@windriver.com> |
| Download | mbox | patch |
| Permalink | /patch/30977/ |
| State | New |
| Headers | show |
Comments
On Mon, Jul 2, 2012 at 2:44 AM, Paul Gortmaker <paul.gortmaker@windriver.com> wrote: > The setting is the same in all recipes, so move it to > the shared settings in u-boot.inc > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Acked-by: Otavio Salvador <otavio@ossystems.com.br>
On Mon, Jul 2, 2012 at 4:24 AM, Otavio Salvador <otavio@ossystems.com.br> wrote: > On Mon, Jul 2, 2012 at 2:44 AM, Paul Gortmaker > <paul.gortmaker@windriver.com> wrote: >> The setting is the same in all recipes, so move it to >> the shared settings in u-boot.inc >> >> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > Acked-by: Otavio Salvador <otavio@ossystems.com.br> It shouldn't be using the old, legacy FILESDIR mechanism at all.
On Mon, Jul 2, 2012 at 10:33 AM, Chris Larson <clarson@kergoth.com> wrote: > On Mon, Jul 2, 2012 at 4:24 AM, Otavio Salvador <otavio@ossystems.com.br> wrote: >> On Mon, Jul 2, 2012 at 2:44 AM, Paul Gortmaker >> <paul.gortmaker@windriver.com> wrote: >>> The setting is the same in all recipes, so move it to >>> the shared settings in u-boot.inc >>> >>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> >> >> Acked-by: Otavio Salvador <otavio@ossystems.com.br> > > It shouldn't be using the old, legacy FILESDIR mechanism at all. Indeed; grepping for it shows nothing. This can be removed :-D
On Mon, 2012-07-02 at 13:42 -0300, Otavio Salvador wrote: > On Mon, Jul 2, 2012 at 10:33 AM, Chris Larson <clarson@kergoth.com> wrote: > > On Mon, Jul 2, 2012 at 4:24 AM, Otavio Salvador <otavio@ossystems.com.br> wrote: > >> On Mon, Jul 2, 2012 at 2:44 AM, Paul Gortmaker > >> <paul.gortmaker@windriver.com> wrote: > >>> The setting is the same in all recipes, so move it to > >>> the shared settings in u-boot.inc > >>> > >>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > >> > >> Acked-by: Otavio Salvador <otavio@ossystems.com.br> > > > > It shouldn't be using the old, legacy FILESDIR mechanism at all. > > Indeed; grepping for it shows nothing. > > This can be removed :-D This isn't what Chris meant. BitBake handles FILESDIR, not the metadata (and grepping bitbake will show a result). I'm tempted to take the patch on the grounds that a single reference to fix is probably easier than several other references. The replacement is probably something like: FILESPATH =. "${FILE_DIRNAME}/u-boot-git/${MACHINE}:" We should really get on, replace the remaining references and complete removal of FILESDIR. Cheers, Richard
Patch
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index 5de3583..3226bd4 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" +FILESDIR = "${@os.path.dirname(d.getVar('FILE',1))}/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
The setting is the same in all recipes, so move it to the shared settings in u-boot.inc Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- 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(-)