From 05fd1a84882f4d992519e023a8ef40c017701776 Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 30 Jun 2020 21:45:45 +0200 Subject: Apply the perf fix only when meta-rcar-gen3-adas is not present MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently the upstream rcar bsp does need the fix for building perf. The meta-rcar-gen3-adas layer contains a fix in the big patchqueue. Thus conditionally apply the perf build fix. Bug-AGL: SPEC-3443 Signed-off-by: Jan-Simon Möller Change-Id: Icbf53add71ed731c35dec149841691c82ae4372c Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24914 Reviewed-by: Stéphane Desneux --- .../recipes-kernel/linux/linux-renesas_%.bbappend | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'meta-agl-bsp/meta-rcar-gen3') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend index 405fc97a0..43aeb6272 100644 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend +++ b/meta-agl-bsp/meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend @@ -5,14 +5,16 @@ require recipes-kernel/linux/linux-agl.inc SRC_URI_append = " file://namespace_fix.cfg \ " +# This can fix a compilation issue with perf. As this seems to collide with the cogent layer +# we apply this here by variable and reset it when the -adas layer is present. +perfFIX ??= " file://9999-perf-libbft-upstream.patch " +# + # Add ADSP patch to enable and add sound hardware abstraction SRC_URI_append_ulcb = " \ file://0004-ADSP-enable-and-add-sound-hardware-abstraction.patch \ + ${perfFIX} \ " -# This can fix a compilation issue with perf. This seems to collide with the cogent layer -# so for now just don't apply and see if or where we need this. -# file://9999-perf-libbft-upstream.patch \ -# # For Xen SRC_URI_append = " \ -- cgit 1.2.3-korg