From 39902b66a174446a49e1083c357d86b74daef425 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 21 Apr 2017 16:32:43 +0200 Subject: BSP's should not ship files in /usr/local/ * replace /usr/local with path /usr/share/renesas using: RENESAS_DATADIR = "/usr/share/renesas" - meta-rcar-gen2/include/rcar-gen2-path-common.inc Bug-AGL: SPEC-533 Change-Id: I66350e850df385e901dc4a0ff56bf04452f90868 Signed-off-by: Ronan Le Martret --- .../recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch | 4 ++-- common/recipes-graphics/directfb/directfb_1.6.3.bbappend | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'common/recipes-graphics/directfb') diff --git a/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch b/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch index 9bea5a3..725e02e 100644 --- a/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch +++ b/common/recipes-graphics/directfb/directfb/fbdev-uiomux-register.patch @@ -28,7 +28,7 @@ diff -ru DirectFB-1.6.0//systems/fbdev/Makefile.am ../DirectFB-1.6.0//systems/fb -I$(top_srcdir)/lib \ - -I$(top_srcdir)/src + -I$(top_srcdir)/src \ -+ -I/usr/local/include ++ -I@RENESAS_DATADIR@/include AM_CPPFLAGS = -D_XOPEN_SOURCE=500 @@ -38,7 +38,7 @@ diff -ru DirectFB-1.6.0//systems/fbdev/Makefile.am ../DirectFB-1.6.0//systems/fb -avoid-version \ - -module + -module \ -+ -L/usr/local/lib ++ -L@RENESAS_DATADIR@/lib libdirectfb_fbdev_la_SOURCES = \ agp.c \ diff --git a/common/recipes-graphics/directfb/directfb_1.6.3.bbappend b/common/recipes-graphics/directfb/directfb_1.6.3.bbappend index 4d839a4..f813c78 100644 --- a/common/recipes-graphics/directfb/directfb_1.6.3.bbappend +++ b/common/recipes-graphics/directfb/directfb_1.6.3.bbappend @@ -1,6 +1,13 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" SRC_URI_append_armadillo800eva = " file://fbdev-uiomux-register.patch" +require include/rcar-gen2-path-common.inc + EXTRA_OECONF += "\ --with-inputdrivers=linuxinput \ " + +do_configure_prepend_armadillo800eva() { + sed -i "s,@RENESAS_DATADIR@,${RENESAS_DATADIR},g" \ + ${S}/systems/fbdev/Makefile.am +} -- cgit 1.2.3-korg