From 728fae43fc82e73c3f369777497279023b140993 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Tue, 30 Jun 2020 19:12:56 +0200 Subject: Revert temp fix of perf build and weston bbappend MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to evaluate if and where we need to place the perf fix or if upstream includes it. Likewise for the weston bbappend. Bug-AGL: SPEC-3443 Change-Id: I78fb37bc3b0d4531c70e71d70c6663de1ab0d987 Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/24911 Reviewed-by: Stéphane Desneux --- .../meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend | 1 - .../meta-rcar-gen3/recipes-kernel/linux/linux-renesas_%.bbappend | 5 ++++- 2 files changed, 4 insertions(+), 2 deletions(-) delete mode 100644 meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend (limited to 'meta-agl-bsp/meta-rcar-gen3') diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend deleted file mode 100644 index 6ce747270..000000000 --- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend +++ /dev/null @@ -1 +0,0 @@ -DEPENDS_append_rcar-gen3 = " gstreamer1.0-plugins-base" 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 e45370beb..405fc97a0 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 @@ -8,8 +8,11 @@ SRC_URI_append = " file://namespace_fix.cfg \ # Add ADSP patch to enable and add sound hardware abstraction SRC_URI_append_ulcb = " \ file://0004-ADSP-enable-and-add-sound-hardware-abstraction.patch \ - file://9999-perf-libbft-upstream.patch \ " +# 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