From: Sasha Levin Date: Wed, 31 Oct 2018 15:19:10 +0000 (-0400) Subject: queue perf-tools-disable-parallelism-for-make-clean.patch X-Git-Tag: v4.19.1~26 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbbf6dfe47c71f077bf82e66343e86754b5bdcae;p=thirdparty%2Fkernel%2Fstable-queue.git queue perf-tools-disable-parallelism-for-make-clean.patch Signed-off-by: Sasha Levin --- diff --git a/queue-3.18/perf-tools-disable-parallelism-for-make-clean.patch b/queue-3.18/perf-tools-disable-parallelism-for-make-clean.patch new file mode 100644 index 00000000000..849a7e8d356 --- /dev/null +++ b/queue-3.18/perf-tools-disable-parallelism-for-make-clean.patch @@ -0,0 +1,56 @@ +From abef03eea4cc4aed7cb5889e3e013bd0570cc34f Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Thu, 5 Jul 2018 15:15:27 +0200 +Subject: perf tools: Disable parallelism for 'make clean' + +[ Upstream commit da15fc2fa9c07b23db8f5e479bd8a9f0d741ca07 ] + +The Yocto build system does a 'make clean' when rebuilding due to +changed dependencies, and that consistently fails for me (causing the +whole BSP build to fail) with errors such as + +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: find: '[...]/perf/1.0-r9/perf-1.0/libtraceevent.a''[...]/perf/1.0-r9/perf-1.0/libtraceevent.a': No such file or directory: No such file or directory +| +[...] +| find: cannot delete '/mnt/xfs/devel/pil/yocto/tmp-glibc/work/wandboard-oe-linux-gnueabi/perf/1.0-r9/perf-1.0/util/.pstack.o.cmd': No such file or directory + +Apparently (despite the comment), 'make clean' ends up launching +multiple sub-makes that all want to remove the same things - perhaps +this only happens in combination with a O=... parameter. In any case, we +don't lose much by explicitly disabling the parallelism for the clean +target, and it makes automated builds much more reliable. + +Signed-off-by: Rasmus Villemoes +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index cb2e5868c8e8..70b03103102d 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -69,10 +69,10 @@ all tags TAGS: + $(make) + + # +-# The clean target is not really parallel, don't print the jobs info: ++# Explicitly disable parallelism for the clean target. + # + clean: +- $(make) ++ $(make) -j1 + + # + # The build-test target is not really parallel, don't print the jobs info: +-- +2.17.1 + diff --git a/queue-3.18/series b/queue-3.18/series index 1ba07bcf26f..93f432eb75b 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -127,3 +127,4 @@ net-fix-warnings-in-make-htmldocs-by-moving-macro-de.patch x86-pci-mark-broadwell-ep-home-agent-1-as-having-non.patch unix-correctly-track-in-flight-fds-in-sending-proces.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch +perf-tools-disable-parallelism-for-make-clean.patch diff --git a/queue-4.14/perf-tools-disable-parallelism-for-make-clean.patch b/queue-4.14/perf-tools-disable-parallelism-for-make-clean.patch new file mode 100644 index 00000000000..ae28a6c8345 --- /dev/null +++ b/queue-4.14/perf-tools-disable-parallelism-for-make-clean.patch @@ -0,0 +1,56 @@ +From b96750e244b89bdfcb2d89a252b1025f1072a367 Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Thu, 5 Jul 2018 15:15:27 +0200 +Subject: perf tools: Disable parallelism for 'make clean' + +[ Upstream commit da15fc2fa9c07b23db8f5e479bd8a9f0d741ca07 ] + +The Yocto build system does a 'make clean' when rebuilding due to +changed dependencies, and that consistently fails for me (causing the +whole BSP build to fail) with errors such as + +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: find: '[...]/perf/1.0-r9/perf-1.0/libtraceevent.a''[...]/perf/1.0-r9/perf-1.0/libtraceevent.a': No such file or directory: No such file or directory +| +[...] +| find: cannot delete '/mnt/xfs/devel/pil/yocto/tmp-glibc/work/wandboard-oe-linux-gnueabi/perf/1.0-r9/perf-1.0/util/.pstack.o.cmd': No such file or directory + +Apparently (despite the comment), 'make clean' ends up launching +multiple sub-makes that all want to remove the same things - perhaps +this only happens in combination with a O=... parameter. In any case, we +don't lose much by explicitly disabling the parallelism for the clean +target, and it makes automated builds much more reliable. + +Signed-off-by: Rasmus Villemoes +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index 225454416ed5..7902a5681fc8 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -84,10 +84,10 @@ endif # has_clean + endif # MAKECMDGOALS + + # +-# The clean target is not really parallel, don't print the jobs info: ++# Explicitly disable parallelism for the clean target. + # + clean: +- $(make) ++ $(make) -j1 + + # + # The build-test target is not really parallel, don't print the jobs info, +-- +2.17.1 + diff --git a/queue-4.14/series b/queue-4.14/series index 65b4f6d371b..0073ce0b7df 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -110,3 +110,4 @@ arm-dts-r8a7790-correct-critical-cpu-temperature.patch media-uvcvideo-fix-driver-reference-counting.patch alsa-usx2y-fix-invalid-stream-urbs.patch revert-netfilter-ipv6-nf_defrag-drop-skb-dst-before-.patch +perf-tools-disable-parallelism-for-make-clean.patch diff --git a/queue-4.18/perf-tools-disable-parallelism-for-make-clean.patch b/queue-4.18/perf-tools-disable-parallelism-for-make-clean.patch new file mode 100644 index 00000000000..256b6e8236f --- /dev/null +++ b/queue-4.18/perf-tools-disable-parallelism-for-make-clean.patch @@ -0,0 +1,56 @@ +From 469391d4a2716ef530fd30195c50036c666e505f Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Thu, 5 Jul 2018 15:15:27 +0200 +Subject: perf tools: Disable parallelism for 'make clean' + +[ Upstream commit da15fc2fa9c07b23db8f5e479bd8a9f0d741ca07 ] + +The Yocto build system does a 'make clean' when rebuilding due to +changed dependencies, and that consistently fails for me (causing the +whole BSP build to fail) with errors such as + +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: find: '[...]/perf/1.0-r9/perf-1.0/libtraceevent.a''[...]/perf/1.0-r9/perf-1.0/libtraceevent.a': No such file or directory: No such file or directory +| +[...] +| find: cannot delete '/mnt/xfs/devel/pil/yocto/tmp-glibc/work/wandboard-oe-linux-gnueabi/perf/1.0-r9/perf-1.0/util/.pstack.o.cmd': No such file or directory + +Apparently (despite the comment), 'make clean' ends up launching +multiple sub-makes that all want to remove the same things - perhaps +this only happens in combination with a O=... parameter. In any case, we +don't lose much by explicitly disabling the parallelism for the clean +target, and it makes automated builds much more reliable. + +Signed-off-by: Rasmus Villemoes +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index 225454416ed5..7902a5681fc8 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -84,10 +84,10 @@ endif # has_clean + endif # MAKECMDGOALS + + # +-# The clean target is not really parallel, don't print the jobs info: ++# Explicitly disable parallelism for the clean target. + # + clean: +- $(make) ++ $(make) -j1 + + # + # The build-test target is not really parallel, don't print the jobs info, +-- +2.17.1 + diff --git a/queue-4.18/series b/queue-4.18/series index b9fe3e3b80e..cb414b953af 100644 --- a/queue-4.18/series +++ b/queue-4.18/series @@ -99,3 +99,4 @@ afs-fix-cell-proc-list.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch revert-mm-slowly-shrink-slabs-with-a-relatively-smal.patch revert-netfilter-ipv6-nf_defrag-drop-skb-dst-before-.patch +perf-tools-disable-parallelism-for-make-clean.patch diff --git a/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch b/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch new file mode 100644 index 00000000000..8a20d4b2c91 --- /dev/null +++ b/queue-4.4/perf-tools-disable-parallelism-for-make-clean.patch @@ -0,0 +1,56 @@ +From 10d2ca83981cb5fb597e74bb1c702ecf7c237dfe Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Thu, 5 Jul 2018 15:15:27 +0200 +Subject: perf tools: Disable parallelism for 'make clean' + +[ Upstream commit da15fc2fa9c07b23db8f5e479bd8a9f0d741ca07 ] + +The Yocto build system does a 'make clean' when rebuilding due to +changed dependencies, and that consistently fails for me (causing the +whole BSP build to fail) with errors such as + +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: find: '[...]/perf/1.0-r9/perf-1.0/libtraceevent.a''[...]/perf/1.0-r9/perf-1.0/libtraceevent.a': No such file or directory: No such file or directory +| +[...] +| find: cannot delete '/mnt/xfs/devel/pil/yocto/tmp-glibc/work/wandboard-oe-linux-gnueabi/perf/1.0-r9/perf-1.0/util/.pstack.o.cmd': No such file or directory + +Apparently (despite the comment), 'make clean' ends up launching +multiple sub-makes that all want to remove the same things - perhaps +this only happens in combination with a O=... parameter. In any case, we +don't lose much by explicitly disabling the parallelism for the clean +target, and it makes automated builds much more reliable. + +Signed-off-by: Rasmus Villemoes +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index dcd9a70c7193..55933b2eb932 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -69,10 +69,10 @@ all tags TAGS: + $(make) + + # +-# The clean target is not really parallel, don't print the jobs info: ++# Explicitly disable parallelism for the clean target. + # + clean: +- $(make) ++ $(make) -j1 + + # + # The build-test target is not really parallel, don't print the jobs info: +-- +2.17.1 + diff --git a/queue-4.4/series b/queue-4.4/series index ec4223967c3..0891320ac67 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -85,3 +85,4 @@ mips-dec-fix-an-int-handler.s-cpu_daddi_workarounds-.patch arm-dts-imx53-qsb-disable-1.2ghz-opp.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch mtd-spi-nor-add-support-for-is25wp-series-chips.patch +perf-tools-disable-parallelism-for-make-clean.patch diff --git a/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch b/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch new file mode 100644 index 00000000000..fc2f7e41c53 --- /dev/null +++ b/queue-4.9/perf-tools-disable-parallelism-for-make-clean.patch @@ -0,0 +1,56 @@ +From e133c2fd3b03a3eb61ec11d6ac66072b1b11b18b Mon Sep 17 00:00:00 2001 +From: Rasmus Villemoes +Date: Thu, 5 Jul 2018 15:15:27 +0200 +Subject: perf tools: Disable parallelism for 'make clean' + +[ Upstream commit da15fc2fa9c07b23db8f5e479bd8a9f0d741ca07 ] + +The Yocto build system does a 'make clean' when rebuilding due to +changed dependencies, and that consistently fails for me (causing the +whole BSP build to fail) with errors such as + +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: '[...]/perf/1.0-r9/perf-1.0/plugin_mac80211.so': No such file or directory +| find: find: '[...]/perf/1.0-r9/perf-1.0/libtraceevent.a''[...]/perf/1.0-r9/perf-1.0/libtraceevent.a': No such file or directory: No such file or directory +| +[...] +| find: cannot delete '/mnt/xfs/devel/pil/yocto/tmp-glibc/work/wandboard-oe-linux-gnueabi/perf/1.0-r9/perf-1.0/util/.pstack.o.cmd': No such file or directory + +Apparently (despite the comment), 'make clean' ends up launching +multiple sub-makes that all want to remove the same things - perhaps +this only happens in combination with a O=... parameter. In any case, we +don't lose much by explicitly disabling the parallelism for the clean +target, and it makes automated builds much more reliable. + +Signed-off-by: Rasmus Villemoes +Acked-by: Jiri Olsa +Cc: Alexander Shishkin +Cc: Namhyung Kim +Cc: Peter Zijlstra +Link: http://lkml.kernel.org/r/20180705131527.19749-1-linux@rasmusvillemoes.dk +Signed-off-by: Arnaldo Carvalho de Melo +Signed-off-by: Sasha Levin +--- + tools/perf/Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/perf/Makefile b/tools/perf/Makefile +index 32a64e619028..cd86fd7b35c4 100644 +--- a/tools/perf/Makefile ++++ b/tools/perf/Makefile +@@ -83,10 +83,10 @@ endif # has_clean + endif # MAKECMDGOALS + + # +-# The clean target is not really parallel, don't print the jobs info: ++# Explicitly disable parallelism for the clean target. + # + clean: +- $(make) ++ $(make) -j1 + + # + # The build-test target is not really parallel, don't print the jobs info, +-- +2.17.1 + diff --git a/queue-4.9/series b/queue-4.9/series index 74b24811470..c0d30e1c742 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -132,3 +132,4 @@ net-ena-fix-null-dereference-due-to-untimely-napi-in.patch fs-fat-fatent.c-add-cond_resched-to-fat_count_free_c.patch mtd-spi-nor-add-support-for-is25wp-series-chips.patch revert-netfilter-ipv6-nf_defrag-drop-skb-dst-before-.patch +perf-tools-disable-parallelism-for-make-clean.patch