[PATCH] toaster: change TOASTER_CONF to meta-poky

[PATCH] toaster: change TOASTER_CONF to meta-poky

[Belen Barros Pena]

From: Belen Barros Pena <belen.barros.pena@intel.com>

Patch 9d5483c37523ff3d334c98cafb848282b54962cd renames the layer within
the meta-yocto repository to meta-poky. This patch changes the value of
TOASTER_CONF in the toaster set up script to get Toaster to import the
meta-poky/conf/toasterconf.json file.

Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
---
 bitbake/bin/toaster | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
index 72eae64..4e709ab 100755
--- a/bitbake/bin/toaster
+++ b/bitbake/bin/toaster
@@ -248,7 +248,7 @@ fi
 # in the local layers that currently prevent using an arbitrary
 # toasterconf.json
 if [ "$TOASTER_CONF" = "" ]; then
-    TOASTER_CONF="$(dirname $TOASTER)/../../meta-yocto/conf/toasterconf.json"
+    TOASTER_CONF="$(dirname $TOASTER)/../../meta-poky/conf/toasterconf.json"
     export TOASTER_CONF=$(python -c "import os; print os.path.realpath('$TOASTER_CONF')")
 fi
 if [ ! -f $TOASTER_CONF ]; then
-- 
2.5.4 (Apple Git-61)

Re: [PATCH] toaster: change TOASTER_CONF to meta-poky

[Richard Purdie]

On Mon, 2016-02-29 at 15:44 +0000, Belen Barros Pena wrote:
> From: Belen Barros Pena <belen.barros.pena@intel.com>
> 
> Patch 9d5483c37523ff3d334c98cafb848282b54962cd renames the layer
> within
> the meta-yocto repository to meta-poky. This patch changes the value
> of
> TOASTER_CONF in the toaster set up script to get Toaster to import
> the
> meta-poky/conf/toasterconf.json file.
> 
> Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
> ---
>  bitbake/bin/toaster | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
> index 72eae64..4e709ab 100755
> --- a/bitbake/bin/toaster
> +++ b/bitbake/bin/toaster
> @@ -248,7 +248,7 @@ fi
>  # in the local layers that currently prevent using an arbitrary
>  # toasterconf.json
>  if [ "$TOASTER_CONF" = "" ]; then
> -    TOASTER_CONF="$(dirname $TOASTER)/../../meta
> -yocto/conf/toasterconf.json"
> +    TOASTER_CONF="$(dirname $TOASTER)/../../meta
> -poky/conf/toasterconf.json"
>      export TOASTER_CONF=$(python -c "import os; print
> os.path.realpath('$TOASTER_CONF')")
>  fi
>  if [ ! -f $TOASTER_CONF ]; then

Do we still need this or can this be removed given the TEMPLATECONF
code above it in this file? bitbake really shouldn't have OE/Yocto
knowledge ideally.

Cheers,

Richard

Re: [PATCH] toaster: change TOASTER_CONF to meta-poky

[Barros Pena, Belen]

On 29/02/2016 15:59, "toaster-bounces@yoctoproject.org on behalf of
Richard Purdie" <toaster-bounces@yoctoproject.org on behalf of
richard.purdie@linuxfoundation.org> wrote:

>On Mon, 2016-02-29 at 15:44 +0000, Belen Barros Pena wrote:
>> From: Belen Barros Pena <belen.barros.pena@intel.com>
>> 
>> Patch 9d5483c37523ff3d334c98cafb848282b54962cd renames the layer
>> within
>> the meta-yocto repository to meta-poky. This patch changes the value
>> of
>> TOASTER_CONF in the toaster set up script to get Toaster to import
>> the
>> meta-poky/conf/toasterconf.json file.
>> 
>> Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
>> ---
>>  bitbake/bin/toaster | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>> 
>> diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
>> index 72eae64..4e709ab 100755
>> --- a/bitbake/bin/toaster
>> +++ b/bitbake/bin/toaster
>> @@ -248,7 +248,7 @@ fi
>>  # in the local layers that currently prevent using an arbitrary
>>  # toasterconf.json
>>  if [ "$TOASTER_CONF" = "" ]; then
>> -    TOASTER_CONF="$(dirname $TOASTER)/../../meta
>> -yocto/conf/toasterconf.json"
>> +    TOASTER_CONF="$(dirname $TOASTER)/../../meta
>> -poky/conf/toasterconf.json"
>>      export TOASTER_CONF=$(python -c "import os; print
>> os.path.realpath('$TOASTER_CONF')")
>>  fi
>>  if [ ! -f $TOASTER_CONF ]; then
>
>Do we still need this or can this be removed given the TEMPLATECONF
>code above it in this file?

No idea. But fwiw, I commented out lines 250 to 258 of the script, and
started Toaster from scratch. Everything seemed to work the same.

>bitbake really shouldn't have OE/Yocto
>knowledge ideally.
>
>Cheers,
>
>Richard
>
>-- 
>_______________________________________________
>toaster mailing list
>toaster@yoctoproject.org
>https://lists.yoctoproject.org/listinfo/toaster

Re: [PATCH] toaster: change TOASTER_CONF to meta-poky

[Brian Avery]

I pushed a patch to clean up bin/toaster that fixes this among a few
other issues.
-b

On Mon, Feb 29, 2016 at 8:23 AM, Barros Pena, Belen
<belen.barros.pena@intel.com> wrote:
>
>
> On 29/02/2016 15:59, "toaster-bounces@yoctoproject.org on behalf of
> Richard Purdie" <toaster-bounces@yoctoproject.org on behalf of
> richard.purdie@linuxfoundation.org> wrote:
>
>>On Mon, 2016-02-29 at 15:44 +0000, Belen Barros Pena wrote:
>>> From: Belen Barros Pena <belen.barros.pena@intel.com>
>>>
>>> Patch 9d5483c37523ff3d334c98cafb848282b54962cd renames the layer
>>> within
>>> the meta-yocto repository to meta-poky. This patch changes the value
>>> of
>>> TOASTER_CONF in the toaster set up script to get Toaster to import
>>> the
>>> meta-poky/conf/toasterconf.json file.
>>>
>>> Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com>
>>> ---
>>>  bitbake/bin/toaster | 2 +-
>>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/bitbake/bin/toaster b/bitbake/bin/toaster
>>> index 72eae64..4e709ab 100755
>>> --- a/bitbake/bin/toaster
>>> +++ b/bitbake/bin/toaster
>>> @@ -248,7 +248,7 @@ fi
>>>  # in the local layers that currently prevent using an arbitrary
>>>  # toasterconf.json
>>>  if [ "$TOASTER_CONF" = "" ]; then
>>> -    TOASTER_CONF="$(dirname $TOASTER)/../../meta
>>> -yocto/conf/toasterconf.json"
>>> +    TOASTER_CONF="$(dirname $TOASTER)/../../meta
>>> -poky/conf/toasterconf.json"
>>>      export TOASTER_CONF=$(python -c "import os; print
>>> os.path.realpath('$TOASTER_CONF')")
>>>  fi
>>>  if [ ! -f $TOASTER_CONF ]; then
>>
>>Do we still need this or can this be removed given the TEMPLATECONF
>>code above it in this file?
>
> No idea. But fwiw, I commented out lines 250 to 258 of the script, and
> started Toaster from scratch. Everything seemed to work the same.
>
>>bitbake really shouldn't have OE/Yocto
>>knowledge ideally.
>>
>>Cheers,
>>
>>Richard
>>
>>--
>>_______________________________________________
>>toaster mailing list
>>toaster@yoctoproject.org
>>https://lists.yoctoproject.org/listinfo/toaster
>
> --
> _______________________________________________
> toaster mailing list
> toaster@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/toaster