diff options
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index f8e80d0e48..e7ddfff83d 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -134,6 +134,7 @@ do_configure_prepend () { | |||
134 | # config/Makefile. | 134 | # config/Makefile. |
135 | # | 135 | # |
136 | # Also need to relocate .config-detected to $(OUTPUT)/config-detected | 136 | # Also need to relocate .config-detected to $(OUTPUT)/config-detected |
137 | # for kernel sources that do not already do this | ||
137 | # as two builds (e.g. perf and lib32-perf from mutlilib can conflict | 138 | # as two builds (e.g. perf and lib32-perf from mutlilib can conflict |
138 | # with each other if its in the shared source directory | 139 | # with each other if its in the shared source directory |
139 | # | 140 | # |
@@ -141,15 +142,15 @@ do_configure_prepend () { | |||
141 | # Match $(prefix)/$(lib) and $(prefix)/lib | 142 | # Match $(prefix)/$(lib) and $(prefix)/lib |
142 | sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ | 143 | sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ |
143 | -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ | 144 | -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ |
144 | -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ | 145 | -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
145 | ${S}/tools/perf/config/Makefile | 146 | ${S}/tools/perf/config/Makefile |
146 | fi | 147 | fi |
147 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then | 148 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then |
148 | sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ | 149 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
149 | ${S}/tools/perf/Makefile.perf | 150 | ${S}/tools/perf/Makefile.perf |
150 | fi | 151 | fi |
151 | if [ -e "${S}/tools/build/Makefile.build" ]; then | 152 | if [ -e "${S}/tools/build/Makefile.build" ]; then |
152 | sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ | 153 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
153 | ${S}/tools/build/Makefile.build | 154 | ${S}/tools/build/Makefile.build |
154 | fi | 155 | fi |
155 | 156 | ||