diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2016-01-14 01:00:38 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2016-01-14 01:00:38 +0000 |
| commit | 8a8a936eabef433194c8c148370d59fe9f8501fd (patch) | |
| tree | 4033638d0a284d2c143b447bbb429d6544a2ad2a /target/linux | |
| parent | fb662feccd137435fda153ce762aa48c815fb26b (diff) | |
| download | master-187ad058-8a8a936eabef433194c8c148370d59fe9f8501fd.tar.gz master-187ad058-8a8a936eabef433194c8c148370d59fe9f8501fd.tar.bz2 master-187ad058-8a8a936eabef433194c8c148370d59fe9f8501fd.zip | |
kernel: backport perf build fixes to 4.1
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48231 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
2 files changed, 81 insertions, 0 deletions
diff --git a/target/linux/generic/patches-4.1/010-perf-tools-Create-config.detected-into-OUTPUT-direct.patch b/target/linux/generic/patches-4.1/010-perf-tools-Create-config.detected-into-OUTPUT-direct.patch new file mode 100644 index 0000000000..f2c1cdd343 --- /dev/null +++ b/target/linux/generic/patches-4.1/010-perf-tools-Create-config.detected-into-OUTPUT-direct.patch @@ -0,0 +1,54 @@ +From: Aaro Koskinen <aaro.koskinen@nokia.com> +Date: Wed, 1 Jul 2015 14:54:42 +0300 +Subject: [PATCH] perf tools: Create config.detected into OUTPUT directory + +Create config.detected into OUTPUT directory instead of source +directory. + +This fixes parallel builds that share the same source directory. + +Signed-off-by: Aaro Koskinen <aaro.koskinen@nokia.com> +Acked-by: Jiri Olsa <jolsa@kernel.org> +Cc: Paul Mackerras <paulus@samba.org> +Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> +Link: http://lkml.kernel.org/r/1435751683-18500-1-git-send-email-aaro.koskinen@nokia.com +Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +--- + +--- a/tools/build/Makefile.build ++++ b/tools/build/Makefile.build +@@ -25,7 +25,7 @@ build-dir := $(srctree)/tools/build + include $(build-dir)/Build.include + + # do not force detected configuration +--include .config-detected ++-include $(OUTPUT).config-detected + + # Init all relevant variables used in build files so + # 1) they have correct type +--- a/tools/perf/Makefile.perf ++++ b/tools/perf/Makefile.perf +@@ -528,7 +528,7 @@ config-clean: + clean: $(LIBTRACEEVENT)-clean $(LIBAPI)-clean config-clean + $(call QUIET_CLEAN, core-objs) $(RM) $(LIB_FILE) $(OUTPUT)perf-archive $(OUTPUT)perf-with-kcore $(LANG_BINDINGS) + $(Q)find . -name '*.o' -delete -o -name '\.*.cmd' -delete -o -name '\.*.d' -delete +- $(Q)$(RM) .config-detected ++ $(Q)$(RM) $(OUTPUT).config-detected + $(call QUIET_CLEAN, core-progs) $(RM) $(ALL_PROGRAMS) perf perf-read-vdso32 perf-read-vdsox32 + $(call QUIET_CLEAN, core-gen) $(RM) *.spec *.pyc *.pyo */*.pyc */*.pyo $(OUTPUT)common-cmds.h TAGS tags cscope* $(OUTPUT)PERF-VERSION-FILE $(OUTPUT)FEATURE-DUMP $(OUTPUT)util/*-bison* $(OUTPUT)util/*-flex* + $(QUIET_SUBDIR0)Documentation $(QUIET_SUBDIR1) clean +--- a/tools/perf/config/Makefile ++++ b/tools/perf/config/Makefile +@@ -11,9 +11,9 @@ ifneq ($(obj-perf),) + obj-perf := $(abspath $(obj-perf))/ + endif + +-$(shell echo -n > .config-detected) +-detected = $(shell echo "$(1)=y" >> .config-detected) +-detected_var = $(shell echo "$(1)=$($(1))" >> .config-detected) ++$(shell echo -n > $(OUTPUT).config-detected) ++detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected) ++detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) + + CFLAGS := $(EXTRA_CFLAGS) $(EXTRA_WARNINGS) + diff --git a/target/linux/generic/patches-4.1/011-perf-tools-Fix-makefile-generation-under-dash.patch b/target/linux/generic/patches-4.1/011-perf-tools-Fix-makefile-generation-under-dash.patch new file mode 100644 index 0000000000..45ea1a04f2 --- /dev/null +++ b/target/linux/generic/patches-4.1/011-perf-tools-Fix-makefile-generation-under-dash.patch @@ -0,0 +1,27 @@ +From: Sergei Trofimovich <siarheit@google.com> +Date: Sun, 19 Jul 2015 10:30:05 +0100 +Subject: [PATCH] perf tools: Fix makefile generation under dash + +Under dash 'echo -n' yields '-n' to stdout. Use printf "" instead. + +Signed-off-by: Sergei Trofimovich <siarheit@google.com> +Acked-by: Ingo Molnar <mingo@kernel.org> +Acked-by: Jiri Olsa <jolsa@kernel.org> +Cc: Adrian Hunter <adrian.hunter@intel.com> +Cc: Namhyung Kim <namhyung@kernel.org> +Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> +Link: http://lkml.kernel.org/r/1437298205-29305-1-git-send-email-siarheit@google.com +Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> +--- + +--- a/tools/perf/config/Makefile ++++ b/tools/perf/config/Makefile +@@ -11,7 +11,7 @@ ifneq ($(obj-perf),) + obj-perf := $(abspath $(obj-perf))/ + endif + +-$(shell echo -n > $(OUTPUT).config-detected) ++$(shell printf "" > $(OUTPUT).config-detected) + detected = $(shell echo "$(1)=y" >> $(OUTPUT).config-detected) + detected_var = $(shell echo "$(1)=$($(1))" >> $(OUTPUT).config-detected) + |