yoctoproject/poky-contrib
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky-contrib synced 2025-10-14 03:05:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

perf: Improve build race/reproducibulity fixes

Browse Source 
The include options shouldn't be needed with the make fix but issues still remained.
Looking at the logs, it looks like these are from other header directories and
we need to run "make install_headers" for all of the sub components before starting
the main build.

Update the workaround to do that for each component with internal header copies.

(From OE-Core rev: 0b5f0a7b1db9f6923c027719181fa60f8fdb73e4)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2025-10-13 12:32:20 +01:00
parent fd601b6168
commit b12f36c46e
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
meta/recipes-kernel/perf/perf.bb
View File

@@ -105,7 +105,7 @@ EXTRA_OEMAKE = '\
LDSHARED="${CC} -shared" \
AR="${AR}" \
LD="${LD}" \
EXTRA_CFLAGS="-ldw -I${S} -I${S}/libperf/include -I${S}/tools/lib/perf/include" \
EXTRA_CFLAGS="-ldw -I${S}" \
YFLAGS='-y --file-prefix-map=${WORKDIR}=${TARGET_DBGSRC_DIR}' \
EXTRA_LDFLAGS="${PERF_EXTRA_LDFLAGS}" \
perfexecdir=${libexecdir} \
@@ -173,7 +173,11 @@ do_compile() {
sed -i -e 's|\$(libdir)/traceevent/plugins|\$(libdir)/traceevent_${KERNEL_VERSION}/plugins|g' ${S}/tools/perf/Makefile.config
# There are two copies of internal headers such as:
# libperf/include/internal/xyarray.h and tools/lib/perf/include/internal/xyarray.h
# For reproducibile binaries, we need to find one copy, hence force libperf to be created first
# For reproducibile binaries, we need to find one copy, hence force libXXX to be created first
for i in api bpf subcmd symbol
do
oe_runmake -C ${S}/tools/lib/$i DESTDIR=${B}/lib$i prefix= install_headers V=1
done
oe_runmake ${B}/libperf/libperf.a V=1
oe_runmake all V=1
}