diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-25 14:37:58 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-07-25 14:41:43 +0100 |
| commit | 741a44c06b1e53b641f2a5c48985a81e3c1e27cf (patch) | |
| tree | 8c683624ea77b94e24695a4eebb10acd08bd4121 /meta/recipes-kernel/perf | |
| parent | 12b5a4417e4d21e2aa5f4aebfb5a5d39bf59865e (diff) | |
| download | openembedded-core-contrib-741a44c06b1e53b641f2a5c48985a81e3c1e27cf.tar.gz | |
perf: Fix config file conflict with 4.1 kernels
If you setup mutlitlibs and then:
bitbake perf libb32-perf
bitbake perf libb32-perf -c cleansstate
bitbake perf libb32-perf
you will see races where the two builds get confused about which directory
they should be using and they corrupt each other.
The issue is that .config-detected is created in ${S}, not $(OUTPUT).
We can fix this by moving the file to $(OUTPUT).
[YCOTO #8043]
(From OE-Core rev: 00608cffffb586e8d2a2075117e710113c471448)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/perf')
| -rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index f18178c7a79..056ac831f7a 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -127,12 +127,27 @@ do_configure_prepend () { # 64 bit build (and library) are not exected. To ensure that libraries are # installed to the correct location, we can use the weak assignment in the # config/Makefile. + # + # Also need to relocate .config-detected to $(OUTPUT)/config-detected + # as two builds (e.g. perf and lib32-perf from mutlilib can conflict + # with each other if its in the shared source directory + # if [ -e "${S}/tools/perf/config/Makefile" ]; then # Match $(prefix)/$(lib) and $(prefix)/lib sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ + -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ ${S}/tools/perf/config/Makefile fi + if [ -e "${S}/tools/perf/Makefile.perf" ]; then + sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ + ${S}/tools/perf/Makefile.perf + fi + if [ -e "${S}/tools/build/Makefile.build" ]; then + sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ + ${S}/tools/build/Makefile.build + fi + # We need to ensure the --sysroot option in CC is preserved if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf |