* [PATCH 0/1] perf.bb: fix multilib build
@ 2014-08-12 11:10 Robert Yang
2014-08-12 11:10 ` [PATCH 1/1] " Robert Yang
2014-09-02 1:18 ` [PATCH 0/1] " Robert Yang
0 siblings, 2 replies; 5+ messages in thread
From: Robert Yang @ 2014-08-12 11:10 UTC (permalink / raw)
To: openembedded-core
The following changes since commit 4321c553d5ae816e566234e981a0815bba046d39:
SIGGEN_EXCLUDERECIPES_ABISAFE: add initscripts (2014-08-11 17:44:09 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib rbt/perf
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/perf
Robert Yang (1):
perf.bb: fix multilib build
meta/recipes-kernel/perf/perf.bb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--
1.7.9.5
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] perf.bb: fix multilib build
2014-08-12 11:10 [PATCH 0/1] perf.bb: fix multilib build Robert Yang
@ 2014-08-12 11:10 ` Robert Yang
2014-09-02 8:28 ` Richard Purdie
2014-09-02 1:18 ` [PATCH 0/1] " Robert Yang
1 sibling, 1 reply; 5+ messages in thread
From: Robert Yang @ 2014-08-12 11:10 UTC (permalink / raw)
To: openembedded-core
Fixed:
$ bitbake perf lib32-perf
ERROR: QA Issue: lib32-perf: Files/directories were installed but not shipped
/usr/lib64
/usr/lib64/traceevent
/usr/lib64/traceevent/plugins
/usr/lib64/traceevent/plugins/plugin_function.so
/usr/lib64/traceevent/plugins/plugin_scsi.so
/usr/lib64/traceevent/plugins/plugin_hrtimer.so
/usr/lib64/traceevent/plugins/plugin_kmem.so
/usr/lib64/traceevent/plugins/plugin_jbd2.so
/usr/lib64/traceevent/plugins/plugin_xen.so
/usr/lib64/traceevent/plugins/plugin_mac80211.so
/usr/lib64/traceevent/plugins/plugin_cfg80211.so
/usr/lib64/traceevent/plugins/plugin_sched_switch.so
/usr/lib64/traceevent/plugins/plugin_kvm.so [installed-vs-shipped]
The perf.do_configure edits kernel's
${STAGING_KERNEL_DIR}/tools/perf/config/Makefile, there would be
problems since kernel doesn't have multilib, and the build result is
undetermined.
Previously, the sed command changed libdir to /usr/lib64 (or 32) in the
Makefile, so the build result was different if we build perf (64) first
or lib32-perf first.
Use the weak assignment "libdir ?=" to instead of "libdir =" will fix
the problem since the multilib builds are in different processes, and
they won't affect each other any more.
The sed command will match both $(prefix)/$(lib) and $(prefix)/lib since
the Makefile may has been modified before this patch.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
meta/recipes-kernel/perf/perf.bb | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index bfd210c..ebfedb9 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -121,10 +121,12 @@ do_configure_prepend () {
# detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
# build, with a 64 bit multilib, the arch won't match and the detection of a
# 64 bit build (and library) are not exected. To ensure that libraries are
- # installed to the correct location, we can make the substitution in the
- # config/Makefile. For non multilib builds, this has no impact.
+ # installed to the correct location, we can use the weak assignment in the
+ # config/Makefile.
if [ -e "${S}/tools/perf/config/Makefile" ]; then
- sed -i 's,libdir = $(prefix)/$(lib),libdir = $(prefix)/${baselib},' ${S}/tools/perf/config/Makefile
+ # Match $(prefix)/$(lib) and $(prefix)/lib
+ sed -i 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
+ ${S}/tools/perf/config/Makefile
fi
# We need to ensure the --sysroot option in CC is preserved
if [ -e "${S}/tools/perf/Makefile.perf" ]; then
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 0/1] perf.bb: fix multilib build
2014-08-12 11:10 [PATCH 0/1] perf.bb: fix multilib build Robert Yang
2014-08-12 11:10 ` [PATCH 1/1] " Robert Yang
@ 2014-09-02 1:18 ` Robert Yang
1 sibling, 0 replies; 5+ messages in thread
From: Robert Yang @ 2014-09-02 1:18 UTC (permalink / raw)
To: openembedded-core
Any comments on this one, please ? This can fix the qa error when build
multilib:
ERROR: QA Issue: lib32-perf: Files/directories were installed but not shipped
/usr/lib64
/usr/lib64/traceevent
/usr/lib64/traceevent/plugins
/usr/lib64/traceevent/plugins/plugin_function.so
/usr/lib64/traceevent/plugins/plugin_scsi.so
/usr/lib64/traceevent/plugins/plugin_hrtimer.so
/usr/lib64/traceevent/plugins/plugin_kmem.so
/usr/lib64/traceevent/plugins/plugin_jbd2.so
/usr/lib64/traceevent/plugins/plugin_xen.so
/usr/lib64/traceevent/plugins/plugin_mac80211.so
/usr/lib64/traceevent/plugins/plugin_cfg80211.so
/usr/lib64/traceevent/plugins/plugin_sched_switch.so
/usr/lib64/traceevent/plugins/plugin_kvm.so [installed-vs-shipped]
And I usually see it.
// Robert
On 08/12/2014 07:10 PM, Robert Yang wrote:
> The following changes since commit 4321c553d5ae816e566234e981a0815bba046d39:
>
> SIGGEN_EXCLUDERECIPES_ABISAFE: add initscripts (2014-08-11 17:44:09 +0100)
>
> are available in the git repository at:
>
> git://git.openembedded.org/openembedded-core-contrib rbt/perf
> http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/perf
>
> Robert Yang (1):
> perf.bb: fix multilib build
>
> meta/recipes-kernel/perf/perf.bb | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] perf.bb: fix multilib build
2014-08-12 11:10 ` [PATCH 1/1] " Robert Yang
@ 2014-09-02 8:28 ` Richard Purdie
2014-09-02 9:28 ` Robert Yang
0 siblings, 1 reply; 5+ messages in thread
From: Richard Purdie @ 2014-09-02 8:28 UTC (permalink / raw)
To: Robert Yang; +Cc: openembedded-core
On Tue, 2014-08-12 at 04:10 -0700, Robert Yang wrote:
> Fixed:
> $ bitbake perf lib32-perf
> ERROR: QA Issue: lib32-perf: Files/directories were installed but not shipped
> /usr/lib64
> /usr/lib64/traceevent
> /usr/lib64/traceevent/plugins
> /usr/lib64/traceevent/plugins/plugin_function.so
> /usr/lib64/traceevent/plugins/plugin_scsi.so
> /usr/lib64/traceevent/plugins/plugin_hrtimer.so
> /usr/lib64/traceevent/plugins/plugin_kmem.so
> /usr/lib64/traceevent/plugins/plugin_jbd2.so
> /usr/lib64/traceevent/plugins/plugin_xen.so
> /usr/lib64/traceevent/plugins/plugin_mac80211.so
> /usr/lib64/traceevent/plugins/plugin_cfg80211.so
> /usr/lib64/traceevent/plugins/plugin_sched_switch.so
> /usr/lib64/traceevent/plugins/plugin_kvm.so [installed-vs-shipped]
>
> The perf.do_configure edits kernel's
> ${STAGING_KERNEL_DIR}/tools/perf/config/Makefile, there would be
> problems since kernel doesn't have multilib, and the build result is
> undetermined.
>
> Previously, the sed command changed libdir to /usr/lib64 (or 32) in the
> Makefile, so the build result was different if we build perf (64) first
> or lib32-perf first.
>
> Use the weak assignment "libdir ?=" to instead of "libdir =" will fix
> the problem since the multilib builds are in different processes, and
> they won't affect each other any more.
>
> The sed command will match both $(prefix)/$(lib) and $(prefix)/lib since
> the Makefile may has been modified before this patch.
>
> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
> ---
> meta/recipes-kernel/perf/perf.bb | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
> index bfd210c..ebfedb9 100644
> --- a/meta/recipes-kernel/perf/perf.bb
> +++ b/meta/recipes-kernel/perf/perf.bb
> @@ -121,10 +121,12 @@ do_configure_prepend () {
> # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
> # build, with a 64 bit multilib, the arch won't match and the detection of a
> # 64 bit build (and library) are not exected. To ensure that libraries are
> - # installed to the correct location, we can make the substitution in the
> - # config/Makefile. For non multilib builds, this has no impact.
> + # installed to the correct location, we can use the weak assignment in the
> + # config/Makefile.
> if [ -e "${S}/tools/perf/config/Makefile" ]; then
> - sed -i 's,libdir = $(prefix)/$(lib),libdir = $(prefix)/${baselib},' ${S}/tools/perf/config/Makefile
> + # Match $(prefix)/$(lib) and $(prefix)/lib
> + sed -i 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
> + ${S}/tools/perf/config/Makefile
> fi
> # We need to ensure the --sysroot option in CC is preserved
> if [ -e "${S}/tools/perf/Makefile.perf" ]; then
What happens if both lib32-perf and lib64-perf are being built at the
same time?
${S} is shared here so we should not be making changes to it. Your patch
doesn't make things worse I guess but there is still a horribly big race
here :(
Cheers,
Richard
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/1] perf.bb: fix multilib build
2014-09-02 8:28 ` Richard Purdie
@ 2014-09-02 9:28 ` Robert Yang
0 siblings, 0 replies; 5+ messages in thread
From: Robert Yang @ 2014-09-02 9:28 UTC (permalink / raw)
To: Richard Purdie; +Cc: openembedded-core
On 09/02/2014 04:28 PM, Richard Purdie wrote:
> On Tue, 2014-08-12 at 04:10 -0700, Robert Yang wrote:
>> Fixed:
>> $ bitbake perf lib32-perf
>> ERROR: QA Issue: lib32-perf: Files/directories were installed but not shipped
>> /usr/lib64
>> /usr/lib64/traceevent
>> /usr/lib64/traceevent/plugins
>> /usr/lib64/traceevent/plugins/plugin_function.so
>> /usr/lib64/traceevent/plugins/plugin_scsi.so
>> /usr/lib64/traceevent/plugins/plugin_hrtimer.so
>> /usr/lib64/traceevent/plugins/plugin_kmem.so
>> /usr/lib64/traceevent/plugins/plugin_jbd2.so
>> /usr/lib64/traceevent/plugins/plugin_xen.so
>> /usr/lib64/traceevent/plugins/plugin_mac80211.so
>> /usr/lib64/traceevent/plugins/plugin_cfg80211.so
>> /usr/lib64/traceevent/plugins/plugin_sched_switch.so
>> /usr/lib64/traceevent/plugins/plugin_kvm.so [installed-vs-shipped]
>>
>> The perf.do_configure edits kernel's
>> ${STAGING_KERNEL_DIR}/tools/perf/config/Makefile, there would be
>> problems since kernel doesn't have multilib, and the build result is
>> undetermined.
>>
>> Previously, the sed command changed libdir to /usr/lib64 (or 32) in the
>> Makefile, so the build result was different if we build perf (64) first
>> or lib32-perf first.
>>
>> Use the weak assignment "libdir ?=" to instead of "libdir =" will fix
>> the problem since the multilib builds are in different processes, and
>> they won't affect each other any more.
>>
>> The sed command will match both $(prefix)/$(lib) and $(prefix)/lib since
>> the Makefile may has been modified before this patch.
>>
>> Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
>> ---
>> meta/recipes-kernel/perf/perf.bb | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
>> index bfd210c..ebfedb9 100644
>> --- a/meta/recipes-kernel/perf/perf.bb
>> +++ b/meta/recipes-kernel/perf/perf.bb
>> @@ -121,10 +121,12 @@ do_configure_prepend () {
>> # detected by perf, since it triggers via: ifeq ($(ARCH),x86_64). In a 32 bit
>> # build, with a 64 bit multilib, the arch won't match and the detection of a
>> # 64 bit build (and library) are not exected. To ensure that libraries are
>> - # installed to the correct location, we can make the substitution in the
>> - # config/Makefile. For non multilib builds, this has no impact.
>> + # installed to the correct location, we can use the weak assignment in the
>> + # config/Makefile.
>> if [ -e "${S}/tools/perf/config/Makefile" ]; then
>> - sed -i 's,libdir = $(prefix)/$(lib),libdir = $(prefix)/${baselib},' ${S}/tools/perf/config/Makefile
>> + # Match $(prefix)/$(lib) and $(prefix)/lib
>> + sed -i 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
>> + ${S}/tools/perf/config/Makefile
>> fi
>> # We need to ensure the --sysroot option in CC is preserved
>> if [ -e "${S}/tools/perf/Makefile.perf" ]; then
>
> What happens if both lib32-perf and lib64-perf are being built at the
> same time?
>
Thanks for the reply, I tested "bitbake lib32-perf lib64-perf" just now:
MACHINE = "qemux86-64"
require conf/multilib.conf
MULTILIBS = "multilib:lib32 multilib:lib64"
DEFAULTTUNE_virtclass-multilib-lib32 = "x86"
DEFAULTTUNE_virtclass-multilib-lib64 = "x86-64"
$ bitbake lib32-perf lib64-perf
$ bitbake lib32-perf lib64-perf -ccleansstate && bitbake lib32-perf lib64-perf
It worked well, and built 3 of them:
$ bitbake lib32-perf lib64-perf perf
$ bitbake lib32-perf lib64-perf perf -ccleansstate && bitbake lib32-perf
lib64-perf perf
It worked well, too. And it didn't work without the patch, we would get
the installed-vs-shipped error as showed in the commit message.
The patch changes "libdir =" to "libdir ?=" in the Makefile so that different
processes have different libdir, then it works.
// Robert
> ${S} is shared here so we should not be making changes to it. Your patch
> doesn't make things worse I guess but there is still a horribly big race
> here :(
>
> Cheers,
>
> Richard
>
>
>
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-02 9:29 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-08-12 11:10 [PATCH 0/1] perf.bb: fix multilib build Robert Yang
2014-08-12 11:10 ` [PATCH 1/1] " Robert Yang
2014-09-02 8:28 ` Richard Purdie
2014-09-02 9:28 ` Robert Yang
2014-09-02 1:18 ` [PATCH 0/1] " Robert Yang
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox