summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-25 14:37:58 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-07-25 14:41:43 +0100
commit741a44c06b1e53b641f2a5c48985a81e3c1e27cf (patch)
tree8c683624ea77b94e24695a4eebb10acd08bd4121 /meta
parent12b5a4417e4d21e2aa5f4aebfb5a5d39bf59865e (diff)
downloadpoky-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')
-rw-r--r--meta/recipes-kernel/perf/perf.bb15
1 files changed, 15 insertions, 0 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb
index f18178c7a7..056ac831f7 100644
--- a/meta/recipes-kernel/perf/perf.bb
+++ b/meta/recipes-kernel/perf/perf.bb
@@ -127,12 +127,27 @@ do_configure_prepend () {
127 # 64 bit build (and library) are not exected. To ensure that libraries are 127 # 64 bit build (and library) are not exected. To ensure that libraries are
128 # installed to the correct location, we can use the weak assignment in the 128 # installed to the correct location, we can use the weak assignment in the
129 # config/Makefile. 129 # config/Makefile.
130 #
131 # Also need to relocate .config-detected to $(OUTPUT)/config-detected
132 # as two builds (e.g. perf and lib32-perf from mutlilib can conflict
133 # with each other if its in the shared source directory
134 #
130 if [ -e "${S}/tools/perf/config/Makefile" ]; then 135 if [ -e "${S}/tools/perf/config/Makefile" ]; then
131 # Match $(prefix)/$(lib) and $(prefix)/lib 136 # Match $(prefix)/$(lib) and $(prefix)/lib
132 sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ 137 sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \
133 -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ 138 -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \
139 -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \
134 ${S}/tools/perf/config/Makefile 140 ${S}/tools/perf/config/Makefile
135 fi 141 fi
142 if [ -e "${S}/tools/perf/Makefile.perf" ]; then
143 sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \
144 ${S}/tools/perf/Makefile.perf
145 fi
146 if [ -e "${S}/tools/build/Makefile.build" ]; then
147 sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \
148 ${S}/tools/build/Makefile.build
149 fi
150
136 # We need to ensure the --sysroot option in CC is preserved 151 # We need to ensure the --sysroot option in CC is preserved
137 if [ -e "${S}/tools/perf/Makefile.perf" ]; then 152 if [ -e "${S}/tools/perf/Makefile.perf" ]; then
138 sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf 153 sed -i 's,CC = $(CROSS_COMPILE)gcc,#CC,' ${S}/tools/perf/Makefile.perf