[PATCH 1/2] meson: don't dump full error log on failure

[PATCH 1/2] meson: don't dump full error log on failure

[Ross Burton]

If the configure fails then we don't really want to see hundreds of lines of
test output (this would be similar to dumping out autoconf's config.log).  The
error includes the path of the full log if further debugging is required.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/meson.bbclass | 1 -
 1 file changed, 1 deletion(-)

diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 66c44e8bb23..e3b452786d8 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -101,7 +101,6 @@ CONFIGURE_FILES = "meson.build"
 meson_do_configure() {
     bbnote Executing meson ${EXTRA_OEMESON}...
     if ! meson ${MESONOPTS} "${MESON_SOURCEPATH}" "${B}" ${MESON_CROSS_FILE} ${EXTRA_OEMESON}; then
-        cat ${B}/meson-logs/meson-log.txt
         bbfatal_log meson failed
     fi
 }
-- 
2.11.0

[PATCH 2/2] python[3]native: allow use of both native Python 2 and 3

[Ross Burton]

Instead of both classes using ${PYTHON_PN} (which is set by python-dir and
python3-dir), hardcode the right values so that it is possible to inherit both
pythonnative and python3native at the same time.

If both are inherited then both native Pythons are available, but the last to be
inherited will be the one to set PYTHON.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/python3native.bbclass | 6 +++---
 meta/classes/pythonnative.bbclass  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/meta/classes/python3native.bbclass b/meta/classes/python3native.bbclass
index 89665efee8b..da12a714703 100644
--- a/meta/classes/python3native.bbclass
+++ b/meta/classes/python3native.bbclass
@@ -1,8 +1,8 @@
 inherit python3-dir
 
-PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
-EXTRANATIVEPATH += "${PYTHON_PN}-native"
-DEPENDS_append = " ${PYTHON_PN}-native "
+PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
+EXTRANATIVEPATH += "python3-native"
+DEPENDS_append = " python3-native "
 
 # python-config and other scripts are using distutils modules
 # which we patch to access these variables
diff --git a/meta/classes/pythonnative.bbclass b/meta/classes/pythonnative.bbclass
index 4cc8b2769c2..ae6600cd155 100644
--- a/meta/classes/pythonnative.bbclass
+++ b/meta/classes/pythonnative.bbclass
@@ -1,11 +1,11 @@
 
 inherit python-dir
 
-PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
+PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python"
 # PYTHON_EXECUTABLE is used by cmake
 PYTHON_EXECUTABLE="${PYTHON}"
-EXTRANATIVEPATH += "${PYTHON_PN}-native"
-DEPENDS_append = " ${PYTHON_PN}-native "
+EXTRANATIVEPATH += "python-native"
+DEPENDS_append = " python-native "
 
 # python-config and other scripts are using distutils modules
 # which we patch to access these variables
-- 
2.11.0

Re: [PATCH 2/2] python[3]native: allow use of both native Python 2 and 3

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 2386 bytes --]

On Tue, Jul 31, 2018 at 10:06 AM Ross Burton <ross.burton@intel.com> wrote:

> Instead of both classes using ${PYTHON_PN} (which is set by python-dir and
> python3-dir), hardcode the right values so that it is possible to inherit
> both
> pythonnative and python3native at the same time.
>
> If both are inherited then both native Pythons are available, but the last
> to be
> inherited will be the one to set PYTHON.


Not particularly thrilled about this usage it seems error prone

>
>
> Signed-off-by: Ross Burton <ross.burton@intel.com>
> ---
>  meta/classes/python3native.bbclass | 6 +++---
>  meta/classes/pythonnative.bbclass  | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/meta/classes/python3native.bbclass
> b/meta/classes/python3native.bbclass
> index 89665efee8b..da12a714703 100644
> --- a/meta/classes/python3native.bbclass
> +++ b/meta/classes/python3native.bbclass
> @@ -1,8 +1,8 @@
>  inherit python3-dir
>
> -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
> -EXTRANATIVEPATH += "${PYTHON_PN}-native"
> -DEPENDS_append = " ${PYTHON_PN}-native "
> +PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
> +EXTRANATIVEPATH += "python3-native"
> +DEPENDS_append = " python3-native "
>
>  # python-config and other scripts are using distutils modules
>  # which we patch to access these variables
> diff --git a/meta/classes/pythonnative.bbclass
> b/meta/classes/pythonnative.bbclass
> index 4cc8b2769c2..ae6600cd155 100644
> --- a/meta/classes/pythonnative.bbclass
> +++ b/meta/classes/pythonnative.bbclass
> @@ -1,11 +1,11 @@
>
>  inherit python-dir
>
> -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
> +PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python"
>  # PYTHON_EXECUTABLE is used by cmake
>  PYTHON_EXECUTABLE="${PYTHON}"
> -EXTRANATIVEPATH += "${PYTHON_PN}-native"
> -DEPENDS_append = " ${PYTHON_PN}-native "
> +EXTRANATIVEPATH += "python-native"
> +DEPENDS_append = " python-native "
>
>  # python-config and other scripts are using distutils modules
>  # which we patch to access these variables
> --
> 2.11.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 3291 bytes --]

Re: [PATCH 2/2] python[3]native: allow use of both native Python 2 and 3

[Burton, Ross]

The last to be inherited behaviour?  That's the same as the current
behaviour, apart from after my change both pythons are available via
PATH.

The only change is that inheriting the second class doesn't wipe out
the first class.

Ross

On 2 August 2018 at 22:05, Khem Raj <raj.khem@gmail.com> wrote:
>
>
> On Tue, Jul 31, 2018 at 10:06 AM Ross Burton <ross.burton@intel.com> wrote:
>>
>> Instead of both classes using ${PYTHON_PN} (which is set by python-dir and
>> python3-dir), hardcode the right values so that it is possible to inherit
>> both
>> pythonnative and python3native at the same time.
>>
>> If both are inherited then both native Pythons are available, but the last
>> to be
>> inherited will be the one to set PYTHON.
>
>
> Not particularly thrilled about this usage it seems error prone
>>
>>
>>
>> Signed-off-by: Ross Burton <ross.burton@intel.com>
>> ---
>>  meta/classes/python3native.bbclass | 6 +++---
>>  meta/classes/pythonnative.bbclass  | 6 +++---
>>  2 files changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/meta/classes/python3native.bbclass
>> b/meta/classes/python3native.bbclass
>> index 89665efee8b..da12a714703 100644
>> --- a/meta/classes/python3native.bbclass
>> +++ b/meta/classes/python3native.bbclass
>> @@ -1,8 +1,8 @@
>>  inherit python3-dir
>>
>> -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
>> -EXTRANATIVEPATH += "${PYTHON_PN}-native"
>> -DEPENDS_append = " ${PYTHON_PN}-native "
>> +PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
>> +EXTRANATIVEPATH += "python3-native"
>> +DEPENDS_append = " python3-native "
>>
>>  # python-config and other scripts are using distutils modules
>>  # which we patch to access these variables
>> diff --git a/meta/classes/pythonnative.bbclass
>> b/meta/classes/pythonnative.bbclass
>> index 4cc8b2769c2..ae6600cd155 100644
>> --- a/meta/classes/pythonnative.bbclass
>> +++ b/meta/classes/pythonnative.bbclass
>> @@ -1,11 +1,11 @@
>>
>>  inherit python-dir
>>
>> -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
>> +PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python"
>>  # PYTHON_EXECUTABLE is used by cmake
>>  PYTHON_EXECUTABLE="${PYTHON}"
>> -EXTRANATIVEPATH += "${PYTHON_PN}-native"
>> -DEPENDS_append = " ${PYTHON_PN}-native "
>> +EXTRANATIVEPATH += "python-native"
>> +DEPENDS_append = " python-native "
>>
>>  # python-config and other scripts are using distutils modules
>>  # which we patch to access these variables
>> --
>> 2.11.0
>>
>> --
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [PATCH 2/2] python[3]native: allow use of both native Python 2 and 3

[Khem Raj]

[-- Attachment #1: Type: text/plain, Size: 3171 bytes --]

On Thu, Aug 2, 2018 at 3:50 PM Burton, Ross <ross.burton@intel.com> wrote:

> The last to be inherited behaviour?  That's the same as the current
> behaviour, apart from after my change both pythons are available via
> PATH.
>
> The only change is that inheriting the second class doesn't wipe out
> the first class.


Ok may be then this variable should be made overridable so a recipe can
select it to be one of two otherwise the default remains as you said

>
>
> Ross
>
> On 2 August 2018 at 22:05, Khem Raj <raj.khem@gmail.com> wrote:
> >
> >
> > On Tue, Jul 31, 2018 at 10:06 AM Ross Burton <ross.burton@intel.com>
> wrote:
> >>
> >> Instead of both classes using ${PYTHON_PN} (which is set by python-dir
> and
> >> python3-dir), hardcode the right values so that it is possible to
> inherit
> >> both
> >> pythonnative and python3native at the same time.
> >>
> >> If both are inherited then both native Pythons are available, but the
> last
> >> to be
> >> inherited will be the one to set PYTHON.
> >
> >
> > Not particularly thrilled about this usage it seems error prone
> >>
> >>
> >>
> >> Signed-off-by: Ross Burton <ross.burton@intel.com>
> >> ---
> >>  meta/classes/python3native.bbclass | 6 +++---
> >>  meta/classes/pythonnative.bbclass  | 6 +++---
> >>  2 files changed, 6 insertions(+), 6 deletions(-)
> >>
> >> diff --git a/meta/classes/python3native.bbclass
> >> b/meta/classes/python3native.bbclass
> >> index 89665efee8b..da12a714703 100644
> >> --- a/meta/classes/python3native.bbclass
> >> +++ b/meta/classes/python3native.bbclass
> >> @@ -1,8 +1,8 @@
> >>  inherit python3-dir
> >>
> >> -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
> >> -EXTRANATIVEPATH += "${PYTHON_PN}-native"
> >> -DEPENDS_append = " ${PYTHON_PN}-native "
> >> +PYTHON="${STAGING_BINDIR_NATIVE}/python3-native/python3"
> >> +EXTRANATIVEPATH += "python3-native"
> >> +DEPENDS_append = " python3-native "
> >>
> >>  # python-config and other scripts are using distutils modules
> >>  # which we patch to access these variables
> >> diff --git a/meta/classes/pythonnative.bbclass
> >> b/meta/classes/pythonnative.bbclass
> >> index 4cc8b2769c2..ae6600cd155 100644
> >> --- a/meta/classes/pythonnative.bbclass
> >> +++ b/meta/classes/pythonnative.bbclass
> >> @@ -1,11 +1,11 @@
> >>
> >>  inherit python-dir
> >>
> >> -PYTHON="${STAGING_BINDIR_NATIVE}/${PYTHON_PN}-native/${PYTHON_PN}"
> >> +PYTHON="${STAGING_BINDIR_NATIVE}/python-native/python"
> >>  # PYTHON_EXECUTABLE is used by cmake
> >>  PYTHON_EXECUTABLE="${PYTHON}"
> >> -EXTRANATIVEPATH += "${PYTHON_PN}-native"
> >> -DEPENDS_append = " ${PYTHON_PN}-native "
> >> +EXTRANATIVEPATH += "python-native"
> >> +DEPENDS_append = " python-native "
> >>
> >>  # python-config and other scripts are using distutils modules
> >>  # which we patch to access these variables
> >> --
> >> 2.11.0
> >>
> >> --
> >> _______________________________________________
> >> Openembedded-core mailing list
> >> Openembedded-core@lists.openembedded.org
> >> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

[-- Attachment #2: Type: text/html, Size: 4647 bytes --]