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 246f1b47f7..b18e474de9 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
| @@ -129,6 +129,7 @@ do_configure_prepend () { | |||
| 129 | # config/Makefile. | 129 | # config/Makefile. |
| 130 | # | 130 | # |
| 131 | # Also need to relocate .config-detected to $(OUTPUT)/config-detected | 131 | # Also need to relocate .config-detected to $(OUTPUT)/config-detected |
| 132 | # for kernel sources that do not already do this | ||
| 132 | # as two builds (e.g. perf and lib32-perf from mutlilib can conflict | 133 | # 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 | # with each other if its in the shared source directory |
| 134 | # | 135 | # |
| @@ -136,15 +137,15 @@ do_configure_prepend () { | |||
| 136 | # Match $(prefix)/$(lib) and $(prefix)/lib | 137 | # Match $(prefix)/$(lib) and $(prefix)/lib |
| 137 | sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ | 138 | sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ |
| 138 | -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ | 139 | -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ |
| 139 | -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ | 140 | -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
| 140 | ${S}/tools/perf/config/Makefile | 141 | ${S}/tools/perf/config/Makefile |
| 141 | fi | 142 | fi |
| 142 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then | 143 | if [ -e "${S}/tools/perf/Makefile.perf" ]; then |
| 143 | sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ | 144 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
| 144 | ${S}/tools/perf/Makefile.perf | 145 | ${S}/tools/perf/Makefile.perf |
| 145 | fi | 146 | fi |
| 146 | if [ -e "${S}/tools/build/Makefile.build" ]; then | 147 | if [ -e "${S}/tools/build/Makefile.build" ]; then |
| 147 | sed -i -e 's,\.config-detected,$(OUTPUT)/config-detected,g' \ | 148 | sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ |
| 148 | ${S}/tools/build/Makefile.build | 149 | ${S}/tools/build/Makefile.build |
| 149 | fi | 150 | fi |
| 150 | 151 | ||
