[3rdparty][pyro][PATCH] u-boot-script-gateworks-imx: fix bootscript source

[3rdparty][pyro][PATCH] u-boot-script-gateworks-imx: fix bootscript source

[Jean-François Têtu]

Currently, the recipe uses the script found relative to ${THISDIR}.
Using ${THISDIR} prevents other recipes from using FILESEXTRAPATHS to
overwrite the default boot script. This commit fixes this by using
${WORKDIR} instead.

Signed-off-by: Jean-François Têtu <jean-francois.tetu@savoirfairelinux.com>
---
 recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb b/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb
index 47de839..5023f37 100644
--- a/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb
+++ b/recipes-bsp/u-boot/u-boot-script-gateworks-imx.bb
@@ -8,7 +8,7 @@ DESTDIR = "/boot"
 S = "${WORKDIR}"
 
 do_compile() {
-    bootscript="${THISDIR}/u-boot-script-gateworks-imx/6x_bootscript-yocto.txt"
+    bootscript="${WORKDIR}/6x_bootscript-yocto.txt"
     echo "bootscript == $bootscript"
 
     uboot-mkimage  -A arm -O linux -T script -C none -a 0 -e 0 \
-- 
2.18.0

Re: [3rdparty][pyro][PATCH] u-boot-script-gateworks-imx: fix bootscript source

[Otavio Salvador]

On Thu, Sep 6, 2018 at 3:49 PM Jean-François Têtu
<jean-francois.tetu@savoirfairelinux.com> wrote:
>
> Currently, the recipe uses the script found relative to ${THISDIR}.
> Using ${THISDIR} prevents other recipes from using FILESEXTRAPATHS to
> overwrite the default boot script. This commit fixes this by using
> ${WORKDIR} instead.
>
> Signed-off-by: Jean-François Têtu <jean-francois.tetu@savoirfairelinux.com>

Thank you for sending the patch. I applied it to the following branches:

- master
- sumo
- rocko
- pyro

Next time, please send it over master and once we merge it we can
backport. Otherwise, we might end with issues being fixed in one
branch but not another...

Best Regards,

--
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Re: [3rdparty][pyro][PATCH] u-boot-script-gateworks-imx: fix bootscript source

[Jean-François Têtu]

Hello,

On Friday, September 7, 2018 3:47:41 PM, Otavio Salvador wrote:
> 
> Thank you for sending the patch. I applied it to the following branches:
> 
> - master
> - sumo
> - rocko
> - pyro

Thanks!
> 
> Next time, please send it over master and once we merge it we can
> backport. Otherwise, we might end with issues being fixed in one
> branch but not another...
> 

I was not sure what to do since I saw some previous -3rdparty patches
being tagged on branches other than master. Since I'm currently using
pyro and that I know it works, I tagged it pyro. I had in mind to wait
about week before rebasing it on master and just build testing it, since
its quite a trivial fix, if I didn't get a response. I see now that its
easier to backport from master than the opposite :).
> Best Regards,
> 
> --
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9 9981-7854          Mobile: +1 (347) 903-9750

Regards,

--
Jean-François Têtu