From af087c3c1f75486b8e84c3da452725718f8011b8 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 2 Nov 2022 15:51:39 +0800 Subject: linux-intel: fix perf reproducibility Include a patch from linux-yocto to fix buildpaths problem when compiling perf. Fixes: | WARNING: perf-1.0-r9 do_package_qa: QA Issue: File /usr/lib/python3.10/site-packages/perf-0.1-py3.10-linux-x86_64.egg/EGG-INFO/SOURCES.txt in package perf-python contains reference to TMPDIR | File /usr/lib/python3.10/site-packages/perf-0.1-py3.10-linux-x86_64.egg/__pycache__/perf.cpython-310.pyc in package perf-python contains reference to TMPDIR [buildpaths] Signed-off-by: Anuj Mittal (cherry picked from commit 2db6c8af4b73ed09aa10007d2b93bb8f9c2ce589) Signed-off-by: Anuj Mittal --- recipes-kernel/linux/linux-intel.inc | 1 + .../linux-intel/fix-perf-reproducibility.patch | 39 ++++++++++++++++++++++ 2 files changed, 40 insertions(+) create mode 100644 recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch diff --git a/recipes-kernel/linux/linux-intel.inc b/recipes-kernel/linux/linux-intel.inc index f3465183..7e2823f0 100644 --- a/recipes-kernel/linux/linux-intel.inc +++ b/recipes-kernel/linux/linux-intel.inc @@ -11,6 +11,7 @@ SRC_URI = " \ file://0001-menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch \ file://0001-vt-conmakehash-improve-reproducibility.patch \ file://0001-lib-build_OID_registry-fix-reproducibility-issues.patch \ + file://fix-perf-reproducibility.patch \ " LINUX_VERSION_EXTENSION ??= "-intel-pk-${LINUX_KERNEL_TYPE}" diff --git a/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch new file mode 100644 index 00000000..1a98b1db --- /dev/null +++ b/recipes-kernel/linux/linux-intel/fix-perf-reproducibility.patch @@ -0,0 +1,39 @@ +From b8cd0e429bf75b673c438a8277d4bc74327df992 Mon Sep 17 00:00:00 2001 +From: Tom Zanussi +Date: Tue, 3 Jul 2012 13:07:23 -0500 +Subject: perf: change --root to --prefix for python install + +Otherwise we get the sysroot path appended to the build path, not what +we want. + +Signed-off-by: Tom Zanussi + +Upstream-Status: Inappropriate + +Taken from linux-yocto, v5.15/standard/base +https://git.yoctoproject.org/linux-yocto/commit?id=b8cd0e429bf75b673c438a8277d4bc74327df992&h=v5.15%2Fstandard%2Fbase + +Signed-off-by: Anuj Mittal +--- + tools/perf/Makefile.perf | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +(limited to 'tools/perf/Makefile.perf') + +diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf +index 8f738e11356d..ee945d8e3996 100644 +--- a/tools/perf/Makefile.perf ++++ b/tools/perf/Makefile.perf +@@ -1022,7 +1022,7 @@ install-bin: install-tools install-tests install-traceevent-plugins + install: install-bin try-install-man + + install-python_ext: +- $(PYTHON_WORD) util/setup.py --quiet install --root='/$(DESTDIR_SQ)' ++ $(PYTHON_WORD) util/setup.py --quiet install --prefix='$(DESTDIR_SQ)/usr' + + # 'make install-doc' should call 'make -C Documentation install' + $(INSTALL_DOC_TARGETS): +-- +cgit + + -- cgit v1.2.3-54-g00ecf