[PATCH 1/2] babletrace2: make manpages multilib identical

[PATCH 1/2] babletrace2: make manpages multilib identical

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 .../0001-Make-manpages-multilib-identical.patch    | 28 ++++++++++++++++++++++
 meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb     |  1 +
 2 files changed, 29 insertions(+)
 create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch

diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
new file mode 100644
index 0000000000..2401b176e6
--- /dev/null
+++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
@@ -0,0 +1,28 @@
+From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001
+From: Jeremy Puhlman <jpuhlman@mvista.com>
+Date: Mon, 9 Mar 2020 21:10:35 +0000
+Subject: [PATCH] Make manpages multilib identical
+
+Upstream-Status: Pending
+Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
+---
+ doc/man/asciidoc-attrs.conf.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in
+index ad1183f1..e11c7031 100644
+--- a/doc/man/asciidoc-attrs.conf.in
++++ b/doc/man/asciidoc-attrs.conf.in
+@@ -1,7 +1,7 @@
+ [attributes]
+ # default values
+-system_plugin_path="@LIBDIR@/babeltrace2/plugins"
+-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers"
++system_plugin_path="@prefix@/lib*/babeltrace2/plugins"
++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers"
+ babeltrace_version="@PACKAGE_VERSION@"
+ enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
+ defrdport=5344
+-- 
+2.24.1
+
diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
index 16953d6807..61bc7f5e6b 100644
--- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
+++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
@@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
 SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \
 	   file://run-ptest \
 	   file://0001-tests-do-not-run-test-applications-from-.libs.patch \
+           file://0001-Make-manpages-multilib-identical.patch \
 	  "
 SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910"
 UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
-- 
2.13.3

[PATCH 2/2] glib-2.0: Correct multilib conflict

[Jeremy A. Puhlman]

From: Jeremy Puhlman <jpuhlman@mvista.com>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
 			rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
 		fi
 	fi
+        if test "x${MLPREFIX}" != "x"; then
+                mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+        fi
 }
 
 # As we do not build python3 for windows, makes no sense to ship the script that's using it
-- 
2.13.3

Re: [PATCH 1/2] babletrace2: make manpages multilib identical

[Jonathan Rajotte-Julien]

Hi

Is this something upstream (lttng-dev mailing list) should be interested in?

Cheers

On Wed, Mar 11, 2020 at 03:22:48PM -0700, Jeremy A. Puhlman wrote:
> From: Jeremy Puhlman <jpuhlman@mvista.com>
> 
> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
> ---
>  .../0001-Make-manpages-multilib-identical.patch    | 28 ++++++++++++++++++++++
>  meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb     |  1 +
>  2 files changed, 29 insertions(+)
>  create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
> 
> diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
> new file mode 100644
> index 0000000000..2401b176e6
> --- /dev/null
> +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
> @@ -0,0 +1,28 @@
> +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001
> +From: Jeremy Puhlman <jpuhlman@mvista.com>
> +Date: Mon, 9 Mar 2020 21:10:35 +0000
> +Subject: [PATCH] Make manpages multilib identical
> +
> +Upstream-Status: Pending
> +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
> +---
> + doc/man/asciidoc-attrs.conf.in | 4 ++--
> + 1 file changed, 2 insertions(+), 2 deletions(-)
> +
> +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in
> +index ad1183f1..e11c7031 100644
> +--- a/doc/man/asciidoc-attrs.conf.in
> ++++ b/doc/man/asciidoc-attrs.conf.in
> +@@ -1,7 +1,7 @@
> + [attributes]
> + # default values
> +-system_plugin_path="@LIBDIR@/babeltrace2/plugins"
> +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers"
> ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins"
> ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers"
> + babeltrace_version="@PACKAGE_VERSION@"
> + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
> + defrdport=5344
> +-- 
> +2.24.1
> +
> diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
> index 16953d6807..61bc7f5e6b 100644
> --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
> +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
> @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
>  SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \
>  	   file://run-ptest \
>  	   file://0001-tests-do-not-run-test-applications-from-.libs.patch \
> +           file://0001-Make-manpages-multilib-identical.patch \
>  	  "
>  SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910"
>  UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
> -- 
> 2.13.3
> 
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Jonathan Rajotte-Julien
EfficiOS

Re: [PATCH 1/2] babletrace2: make manpages multilib identical

[Jeremy A. Puhlman]

Maybe. They may want it to be altered depending on their preference for 
how to express the system libdir. I have
pushed similar to other projects and gotten a mixed bag of responses.

I haven't tried to push it yet, but its in my queue.

On 3/12/2020 7:25 AM, Jonathan Rajotte-Julien wrote:
> Hi
>
> Is this something upstream (lttng-dev mailing list) should be interested in?
>
> Cheers
>
> On Wed, Mar 11, 2020 at 03:22:48PM -0700, Jeremy A. Puhlman wrote:
>> From: Jeremy Puhlman <jpuhlman@mvista.com>
>>
>> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
>> ---
>>   .../0001-Make-manpages-multilib-identical.patch    | 28 ++++++++++++++++++++++
>>   meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb     |  1 +
>>   2 files changed, 29 insertions(+)
>>   create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
>>
>> diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
>> new file mode 100644
>> index 0000000000..2401b176e6
>> --- /dev/null
>> +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-multilib-identical.patch
>> @@ -0,0 +1,28 @@
>> +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00 2001
>> +From: Jeremy Puhlman <jpuhlman@mvista.com>
>> +Date: Mon, 9 Mar 2020 21:10:35 +0000
>> +Subject: [PATCH] Make manpages multilib identical
>> +
>> +Upstream-Status: Pending
>> +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
>> +---
>> + doc/man/asciidoc-attrs.conf.in | 4 ++--
>> + 1 file changed, 2 insertions(+), 2 deletions(-)
>> +
>> +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-attrs.conf.in
>> +index ad1183f1..e11c7031 100644
>> +--- a/doc/man/asciidoc-attrs.conf.in
>> ++++ b/doc/man/asciidoc-attrs.conf.in
>> +@@ -1,7 +1,7 @@
>> + [attributes]
>> + # default values
>> +-system_plugin_path="@LIBDIR@/babeltrace2/plugins"
>> +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-providers"
>> ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins"
>> ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-providers"
>> + babeltrace_version="@PACKAGE_VERSION@"
>> + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
>> + defrdport=5344
>> +--
>> +2.24.1
>> +
>> diff --git a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
>> index 16953d6807..61bc7f5e6b 100644
>> --- a/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
>> +++ b/meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb
>> @@ -10,6 +10,7 @@ DEPENDS = "glib-2.0 util-linux popt bison-native flex-native"
>>   SRC_URI = "git://git.linuxfoundation.org/diamon/babeltrace.git;branch=stable-2.0 \
>>   	   file://run-ptest \
>>   	   file://0001-tests-do-not-run-test-applications-from-.libs.patch \
>> +           file://0001-Make-manpages-multilib-identical.patch \
>>   	  "
>>   SRCREV = "06df58f89ee51b1a2c6a2c187ec3f15691633910"
>>   UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>2(\.\d+)+)$"
>> -- 
>> 2.13.3
>>
>> -- 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core

-- 
Jeremy A. Puhlman
jpuhlman@mvista.com

Re: [PATCH 1/2] babletrace2: make manpages multilib identical

[Richard Purdie]

On Thu, 2020-03-12 at 10:25 -0400, Jonathan Rajotte-Julien wrote:
> Is this something upstream (lttng-dev mailing list) should be
> interested in?

Its a tough one as the man page is technically correct but the
references give us a challenge in packaging it. I can therefore
understand upstreams not accepting changes like this but if they were
open to some kind of tweak it does help us not have to have patches...

Cheers,

Richard

> Cheers
> 
> On Wed, Mar 11, 2020 at 03:22:48PM -0700, Jeremy A. Puhlman wrote:
> > From: Jeremy Puhlman <jpuhlman@mvista.com>
> > 
> > Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
> > ---
> >  .../0001-Make-manpages-multilib-identical.patch    | 28
> > ++++++++++++++++++++++
> >  meta/recipes-kernel/lttng/babeltrace2_2.0.1.bb     |  1 +
> >  2 files changed, 29 insertions(+)
> >  create mode 100644 meta/recipes-kernel/lttng/babeltrace2/0001-
> > Make-manpages-multilib-identical.patch
> > 
> > diff --git a/meta/recipes-kernel/lttng/babeltrace2/0001-Make-
> > manpages-multilib-identical.patch b/meta/recipes-
> > kernel/lttng/babeltrace2/0001-Make-manpages-multilib-
> > identical.patch
> > new file mode 100644
> > index 0000000000..2401b176e6
> > --- /dev/null
> > +++ b/meta/recipes-kernel/lttng/babeltrace2/0001-Make-manpages-
> > multilib-identical.patch
> > @@ -0,0 +1,28 @@
> > +From 56986190e4b0c10945ce6aaa7ca10d6bd8a26a39 Mon Sep 17 00:00:00
> > 2001
> > +From: Jeremy Puhlman <jpuhlman@mvista.com>
> > +Date: Mon, 9 Mar 2020 21:10:35 +0000
> > +Subject: [PATCH] Make manpages multilib identical
> > +
> > +Upstream-Status: Pending
> > +Signed-off-by: Jeremy Puhlman <jpuhlman@mvista.com>
> > +---
> > + doc/man/asciidoc-attrs.conf.in | 4 ++--
> > + 1 file changed, 2 insertions(+), 2 deletions(-)
> > +
> > +diff --git a/doc/man/asciidoc-attrs.conf.in b/doc/man/asciidoc-
> > attrs.conf.in
> > +index ad1183f1..e11c7031 100644
> > +--- a/doc/man/asciidoc-attrs.conf.in
> > ++++ b/doc/man/asciidoc-attrs.conf.in
> > +@@ -1,7 +1,7 @@
> > + [attributes]
> > + # default values
> > +-system_plugin_path="@LIBDIR@/babeltrace2/plugins"
> > +-system_plugin_provider_path="@LIBDIR@/babeltrace2/plugin-
> > providers"
> > ++system_plugin_path="@prefix@/lib*/babeltrace2/plugins"
> > ++system_plugin_provider_path="@prefix@/lib*/babeltrace2/plugin-
> > providers"
> > + babeltrace_version="@PACKAGE_VERSION@"
> > + enable_debug_info="@ENABLE_DEBUG_INFO_VAL@"
> > + defrdport=5344
> > +-- 
> > 

Re: [PATCH 1/2] babletrace2: make manpages multilib identical

[Jonathan Rajotte-Julien]

On Fri, Mar 13, 2020 at 07:22:03AM +0000, Richard Purdie wrote:
> On Thu, 2020-03-12 at 10:25 -0400, Jonathan Rajotte-Julien wrote:
> > Is this something upstream (lttng-dev mailing list) should be
> > interested in?
> 
> Its a tough one as the man page is technically correct but the
> references give us a challenge in packaging it. I can therefore
> understand upstreams not accepting changes like this but if they were
> open to some kind of tweak it does help us not have to have patches...

Jeremy does plan to send us a version for upstream (bt2) someday, or at least
start the discussion on how to help yocto packaging on that end. We will see how
we can make everyone happy then.

Cheers

-- 
Jonathan Rajotte-Julien
EfficiOS

回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Chen, Qi]

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

This patch is causing regression in case of qemuarm64 multilib for me. The static-link.test file is not there, resulting the `mv' command failure. I've sent out a patch to fix this problem, but I don't know what's your environment. So please help review.

Regards,
Chen Qi
________________________________
发件人: openembedded-core-bounces@lists.openembedded.org <openembedded-core-bounces@lists.openembedded.org> 代表 Jeremy A. Puhlman <jpuhlman@mvista.com>
发送时间: 2020年3月12日 6:22
收件人: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>
主题: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

From: Jeremy Puhlman <jpuhlman@mvista.com>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
                         rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
                 fi
         fi
+        if test "x${MLPREFIX}" != "x"; then
+                mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+        fi
 }

 # As we do not build python3 for windows, makes no sense to ship the script that's using it
--
2.13.3

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

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

Re: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Jeremy A. Puhlman]

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

Just standard x86/i585. What are you using for your mulitlib. 
ilp32/aarch32/arm7?

require conf/multilib.conf
MULTILIBS = "multilib:lib32"
X86ARCH32 = "i586"
DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
TARGET_ARCH_virtclass-multilib-lib32 = "i586"
TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"

What does your -e look like for the recipe that fails?

On 3/16/2020 8:30 PM, Chen, Qi wrote:
> This patch is causing regression in case of qemuarm64 multilib for me. 
> The static-link.test file is not there, resulting the `mv' command 
> failure. I've sent out a patch to fix this problem, but I don't know 
> what's your environment. So please help review.
>
> Regards,
> Chen Qi
> ------------------------------------------------------------------------
> *发件人:* openembedded-core-bounces@lists.openembedded.org 
> <openembedded-core-bounces@lists.openembedded.org> 代表 Jeremy A. 
> Puhlman <jpuhlman@mvista.com>
> *发送时间:* 2020年3月12日 6:22
> *收件人:* openembedded-core@lists.openembedded.org 
> <openembedded-core@lists.openembedded.org>
> *主题:* [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
> From: Jeremy Puhlman <jpuhlman@mvista.com>
>
> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com>
> ---
>  meta/recipes-core/glib-2.0/glib.inc | 3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/recipes-core/glib-2.0/glib.inc 
> b/meta/recipes-core/glib-2.0/glib.inc
> index 23c347dbf7..edecc51fdb 100644
> --- a/meta/recipes-core/glib-2.0/glib.inc
> +++ b/meta/recipes-core/glib-2.0/glib.inc
> @@ -128,6 +128,9 @@ do_install_append_class-target () {
>                          rm 
> ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
>                  fi
>          fi
> +        if test "x${MLPREFIX}" != "x"; then
> +                mv 
> ${D}${datadir}/installed-tests/glib/static-link.test 
> ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
> +        fi
>  }
>
>  # As we do not build python3 for windows, makes no sense to ship the 
> script that's using it
> -- 
> 2.13.3
>
> -- 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
> <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> 
> 	Virus-free. www.avg.com 
> <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> 
>
>
> <#DAB4FAD8-2DD7-40BB-A1B8-4E2AA1F9FDF2>

-- 
Jeremy A. Puhlman
jpuhlman@mvista.com


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

回复: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Chen, Qi]

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

MULTILIBS ?= "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf"

I think you can use these two lines to reproduce the problem with multilib enabled.

Regards,
Chen Qi
________________________________
发件人: Jeremy A. Puhlman <jpuhlman@mvista.com>
发送时间: 2020年3月17日 12:02
收件人: Chen, Qi <Qi.Chen@windriver.com>; openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>
主题: Re: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

Just standard x86/i585. What are you using for your mulitlib. ilp32/aarch32/arm7?

require conf/multilib.conf
MULTILIBS = "multilib:lib32"
X86ARCH32 = "i586"
DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
TARGET_ARCH_virtclass-multilib-lib32 = "i586"
TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"

What does your -e look like for the recipe that fails?

On 3/16/2020 8:30 PM, Chen, Qi wrote:
This patch is causing regression in case of qemuarm64 multilib for me. The static-link.test file is not there, resulting the `mv' command failure. I've sent out a patch to fix this problem, but I don't know what's your environment. So please help review.

Regards,
Chen Qi
________________________________
发件人: openembedded-core-bounces@lists.openembedded.org<mailto:openembedded-core-bounces@lists.openembedded.org> <openembedded-core-bounces@lists.openembedded.org><mailto:openembedded-core-bounces@lists.openembedded.org> 代表 Jeremy A. Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>
发送时间: 2020年3月12日 6:22
收件人: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> <openembedded-core@lists.openembedded.org><mailto:openembedded-core@lists.openembedded.org>
主题: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

From: Jeremy Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
                         rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
                 fi
         fi
+        if test "x${MLPREFIX}" != "x"; then
+                mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+        fi
 }

 # As we do not build python3 for windows, makes no sense to ship the script that's using it
--
2.13.3

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[https://ipmcdn.avast.com/images/icons/icon-envelope-tick-green-avg-v1.png]<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> Virus-free. www.avg.com<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>


--
Jeremy A. Puhlman
jpuhlman@mvista.com<mailto:jpuhlman@mvista.com>

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

Re: 回复: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Jeremy A. Puhlman]

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

Do you have ptests turned off?
Looks like all the test checking is done in do_install rather then 
do_install_ptest. I think I need to add a check for the existance like 
the change above the added one.

On 3/16/2020 9:31 PM, Chen, Qi wrote:
> MULTILIBS ?= "multilib:lib32"
> DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf"
>
> I think you can use these two lines to reproduce the problem with 
> multilib enabled.
>
> Regards,
> Chen Qi
> ------------------------------------------------------------------------
> *发件人:* Jeremy A. Puhlman <jpuhlman@mvista.com>
> *发送时间:* 2020年3月17日 12:02
> *收件人:* Chen, Qi <Qi.Chen@windriver.com>; 
> openembedded-core@lists.openembedded.org 
> <openembedded-core@lists.openembedded.org>
> *主题:* Re: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib 
> conflict
> Just standard x86/i585. What are you using for your mulitlib. 
> ilp32/aarch32/arm7?
>
> require conf/multilib.conf
> MULTILIBS = "multilib:lib32"
> X86ARCH32 = "i586"
> DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
> TARGET_ARCH_virtclass-multilib-lib32 = "i586"
> TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
> ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"
>
> What does your -e look like for the recipe that fails?
>
> On 3/16/2020 8:30 PM, Chen, Qi wrote:
>> This patch is causing regression in case of qemuarm64 multilib for 
>> me. The static-link.test file is not there, resulting the `mv' 
>> command failure. I've sent out a patch to fix this problem, but I 
>> don't know what's your environment. So please help review.
>>
>> Regards,
>> Chen Qi
>> ------------------------------------------------------------------------
>> *发件人:* openembedded-core-bounces@lists.openembedded.org 
>> <mailto:openembedded-core-bounces@lists.openembedded.org> 
>> <openembedded-core-bounces@lists.openembedded.org> 
>> <mailto:openembedded-core-bounces@lists.openembedded.org> 代表 Jeremy 
>> A. Puhlman <jpuhlman@mvista.com> <mailto:jpuhlman@mvista.com>
>> *发送时间:* 2020年3月12日 6:22
>> *收件人:* openembedded-core@lists.openembedded.org 
>> <mailto:openembedded-core@lists.openembedded.org> 
>> <openembedded-core@lists.openembedded.org> 
>> <mailto:openembedded-core@lists.openembedded.org>
>> *主题:* [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
>> From: Jeremy Puhlman <jpuhlman@mvista.com> <mailto:jpuhlman@mvista.com>
>>
>> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> 
>> <mailto:jpuhlman@mvista.com>
>> ---
>>  meta/recipes-core/glib-2.0/glib.inc | 3 +++
>>  1 file changed, 3 insertions(+)
>>
>> diff --git a/meta/recipes-core/glib-2.0/glib.inc 
>> b/meta/recipes-core/glib-2.0/glib.inc
>> index 23c347dbf7..edecc51fdb 100644
>> --- a/meta/recipes-core/glib-2.0/glib.inc
>> +++ b/meta/recipes-core/glib-2.0/glib.inc
>> @@ -128,6 +128,9 @@ do_install_append_class-target () {
>>                          rm 
>> ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
>>                  fi
>>          fi
>> +        if test "x${MLPREFIX}" != "x"; then
>> +                mv 
>> ${D}${datadir}/installed-tests/glib/static-link.test 
>> ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
>> +        fi
>>  }
>>
>>  # As we do not build python3 for windows, makes no sense to ship the 
>> script that's using it
>> -- 
>> 2.13.3
>>
>> -- 
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org 
>> <mailto:Openembedded-core@lists.openembedded.org>
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
>> <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> 
>> 	Virus-free. www.avg.com 
>> <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> 
>>
>>
>
> -- 
> Jeremy A. Puhlman
> jpuhlman@mvista.com  <mailto:jpuhlman@mvista.com>

-- 
Jeremy A. Puhlman
jpuhlman@mvista.com


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

回复: 回复: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Chen, Qi]

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

Yes. ptest turned off.

Regards,
Chen Qi
________________________________
发件人: Jeremy A. Puhlman <jpuhlman@mvista.com>
发送时间: 2020年3月17日 12:58
收件人: Chen, Qi <Qi.Chen@windriver.com>; openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org>
主题: Re: 回复: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

Do you have ptests turned off?
Looks like all the test checking is done in do_install rather then do_install_ptest. I think I need to add a check for the existance like the change above the added one.

On 3/16/2020 9:31 PM, Chen, Qi wrote:
MULTILIBS ?= "multilib:lib32"
DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf"

I think you can use these two lines to reproduce the problem with multilib enabled.

Regards,
Chen Qi
________________________________
发件人: Jeremy A. Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>
发送时间: 2020年3月17日 12:02
收件人: Chen, Qi <Qi.Chen@windriver.com><mailto:Qi.Chen@windriver.com>; openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> <openembedded-core@lists.openembedded.org><mailto:openembedded-core@lists.openembedded.org>
主题: Re: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

Just standard x86/i585. What are you using for your mulitlib. ilp32/aarch32/arm7?

require conf/multilib.conf
MULTILIBS = "multilib:lib32"
X86ARCH32 = "i586"
DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
TARGET_ARCH_virtclass-multilib-lib32 = "i586"
TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"

What does your -e look like for the recipe that fails?

On 3/16/2020 8:30 PM, Chen, Qi wrote:
This patch is causing regression in case of qemuarm64 multilib for me. The static-link.test file is not there, resulting the `mv' command failure. I've sent out a patch to fix this problem, but I don't know what's your environment. So please help review.

Regards,
Chen Qi
________________________________
发件人: openembedded-core-bounces@lists.openembedded.org<mailto:openembedded-core-bounces@lists.openembedded.org> <openembedded-core-bounces@lists.openembedded.org><mailto:openembedded-core-bounces@lists.openembedded.org> 代表 Jeremy A. Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>
发送时间: 2020年3月12日 6:22
收件人: openembedded-core@lists.openembedded.org<mailto:openembedded-core@lists.openembedded.org> <openembedded-core@lists.openembedded.org><mailto:openembedded-core@lists.openembedded.org>
主题: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict

From: Jeremy Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>

Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com><mailto:jpuhlman@mvista.com>
---
 meta/recipes-core/glib-2.0/glib.inc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc
index 23c347dbf7..edecc51fdb 100644
--- a/meta/recipes-core/glib-2.0/glib.inc
+++ b/meta/recipes-core/glib-2.0/glib.inc
@@ -128,6 +128,9 @@ do_install_append_class-target () {
                         rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
                 fi
         fi
+        if test "x${MLPREFIX}" != "x"; then
+                mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
+        fi
 }

 # As we do not build python3 for windows, makes no sense to ship the script that's using it
--
2.13.3

--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org<mailto:Openembedded-core@lists.openembedded.org>
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[https://ipmcdn.avast.com/images/icons/icon-envelope-tick-green-avg-v1.png]<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> Virus-free. www.avg.com<http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient>


--
Jeremy A. Puhlman
jpuhlman@mvista.com<mailto:jpuhlman@mvista.com>


--
Jeremy A. Puhlman
jpuhlman@mvista.com<mailto:jpuhlman@mvista.com>

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

Re: 回复: 回复: 回复: [PATCH 2/2] glib-2.0: Correct multilib conflict

[Jeremy A. Puhlman]

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

Patch sent to the list.

On 3/16/2020 10:21 PM, Chen, Qi wrote:
> Yes. ptest turned off.
>
> Regards,
> Chen Qi
> ------------------------------------------------------------------------
> *发件人:* Jeremy A. Puhlman <jpuhlman@mvista.com>
> *发送时间:* 2020年3月17日 12:58
> *收件人:* Chen, Qi <Qi.Chen@windriver.com>; 
> openembedded-core@lists.openembedded.org 
> <openembedded-core@lists.openembedded.org>
> *主题:* Re: 回复: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib 
> conflict
> Do you have ptests turned off?
> Looks like all the test checking is done in do_install rather then 
> do_install_ptest. I think I need to add a check for the existance like 
> the change above the added one.
>
> On 3/16/2020 9:31 PM, Chen, Qi wrote:
>> MULTILIBS ?= "multilib:lib32"
>> DEFAULTTUNE_virtclass-multilib-lib32 ?= "armv7vethf"
>>
>> I think you can use these two lines to reproduce the problem with 
>> multilib enabled.
>>
>> Regards,
>> Chen Qi
>> ------------------------------------------------------------------------
>> *发件人:* Jeremy A. Puhlman <jpuhlman@mvista.com> 
>> <mailto:jpuhlman@mvista.com>
>> *发送时间:* 2020年3月17日 12:02
>> *收件人:* Chen, Qi <Qi.Chen@windriver.com> 
>> <mailto:Qi.Chen@windriver.com>; 
>> openembedded-core@lists.openembedded.org 
>> <mailto:openembedded-core@lists.openembedded.org> 
>> <openembedded-core@lists.openembedded.org> 
>> <mailto:openembedded-core@lists.openembedded.org>
>> *主题:* Re: 回复: [OE-core] [PATCH 2/2] glib-2.0: Correct multilib 
>> conflict
>> Just standard x86/i585. What are you using for your mulitlib. 
>> ilp32/aarch32/arm7?
>>
>> require conf/multilib.conf
>> MULTILIBS = "multilib:lib32"
>> X86ARCH32 = "i586"
>> DEFAULTTUNE_virtclass-multilib-lib32 = "i586"
>> TARGET_ARCH_virtclass-multilib-lib32 = "i586"
>> TARGET_LD_ARCH_virtclass-multilib-lib32 = "-m elf_i386"
>> ALTBINDIR_SUFFIX_virtclass-multilib-lib32 = "32"
>>
>> What does your -e look like for the recipe that fails?
>>
>> On 3/16/2020 8:30 PM, Chen, Qi wrote:
>>> This patch is causing regression in case of qemuarm64 multilib for 
>>> me. The static-link.test file is not there, resulting the `mv' 
>>> command failure. I've sent out a patch to fix this problem, but I 
>>> don't know what's your environment. So please help review.
>>>
>>> Regards,
>>> Chen Qi
>>> ------------------------------------------------------------------------
>>> *发件人:* openembedded-core-bounces@lists.openembedded.org 
>>> <mailto:openembedded-core-bounces@lists.openembedded.org> 
>>> <openembedded-core-bounces@lists.openembedded.org> 
>>> <mailto:openembedded-core-bounces@lists.openembedded.org> 代表 Jeremy 
>>> A. Puhlman <jpuhlman@mvista.com> <mailto:jpuhlman@mvista.com>
>>> *发送时间:* 2020年3月12日 6:22
>>> *收件人:* openembedded-core@lists.openembedded.org 
>>> <mailto:openembedded-core@lists.openembedded.org> 
>>> <openembedded-core@lists.openembedded.org> 
>>> <mailto:openembedded-core@lists.openembedded.org>
>>> *主题:* [OE-core] [PATCH 2/2] glib-2.0: Correct multilib conflict
>>> From: Jeremy Puhlman <jpuhlman@mvista.com> <mailto:jpuhlman@mvista.com>
>>>
>>> Signed-off-by: Jeremy A. Puhlman <jpuhlman@mvista.com> 
>>> <mailto:jpuhlman@mvista.com>
>>> ---
>>>  meta/recipes-core/glib-2.0/glib.inc | 3 +++
>>>  1 file changed, 3 insertions(+)
>>>
>>> diff --git a/meta/recipes-core/glib-2.0/glib.inc 
>>> b/meta/recipes-core/glib-2.0/glib.inc
>>> index 23c347dbf7..edecc51fdb 100644
>>> --- a/meta/recipes-core/glib-2.0/glib.inc
>>> +++ b/meta/recipes-core/glib-2.0/glib.inc
>>> @@ -128,6 +128,9 @@ do_install_append_class-target () {
>>>                          rm 
>>> ${D}${datadir}/installed-tests/glib/gdbus-serialization.test
>>>                  fi
>>>          fi
>>> +        if test "x${MLPREFIX}" != "x"; then
>>> +                mv 
>>> ${D}${datadir}/installed-tests/glib/static-link.test 
>>> ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test
>>> +        fi
>>>  }
>>>
>>>  # As we do not build python3 for windows, makes no sense to ship 
>>> the script that's using it
>>> -- 
>>> 2.13.3
>>>
>>> -- 
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org 
>>> <mailto:Openembedded-core@lists.openembedded.org>
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>>
>>> <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> 
>>> 	Virus-free. www.avg.com 
>>> <http://www.avg.com/email-signature?utm_medium=email&utm_source=link&utm_campaign=sig-email&utm_content=emailclient> 
>>>
>>>
>>
>> -- 
>> Jeremy A. Puhlman
>> jpuhlman@mvista.com  <mailto:jpuhlman@mvista.com>
>
> -- 
> Jeremy A. Puhlman
> jpuhlman@mvista.com  <mailto:jpuhlman@mvista.com>

-- 
Jeremy A. Puhlman
jpuhlman@mvista.com


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