diff options
8 files changed, 14 insertions, 14 deletions
diff --git a/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend b/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend index efcc6a0..0dca3d6 100644 --- a/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend +++ b/meta-rcar-gen3/recipes-core/base-files/base-files_%.bbappend @@ -2,10 +2,10 @@ require include/rcar-gen3-path-common.inc FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/:" -SRC_URI_append = " \ +SRC_URI_append_rcar-gen3 = " \ file://fstab \ " -do_install_append () { +do_install_append_rcar-gen3 () { echo "export LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:${RENESAS_DATADIR}/lib\"" >> ${D}${sysconfdir}/profile } diff --git a/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend b/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend index f414a2b..9f5978c 100644 --- a/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend +++ b/meta-rcar-gen3/recipes-core/systemd/systemd_%.bbappend @@ -1 +1 @@ -PACKAGECONFIG_remove = "timesyncd" +PACKAGECONFIG_remove_rcar-gen3 = "timesyncd" diff --git a/meta-rcar-gen3/recipes-graphics/cairo/cairo_%.bbappend b/meta-rcar-gen3/recipes-graphics/cairo/cairo_%.bbappend index ed7e177..8b3cca4 100644 --- a/meta-rcar-gen3/recipes-graphics/cairo/cairo_%.bbappend +++ b/meta-rcar-gen3/recipes-graphics/cairo/cairo_%.bbappend @@ -1,3 +1,3 @@ require include/gles-control.inc -DEPENDS_append = "${@ ' gles-user-module' if '${USE_GLES_WAYLAND}' == '1' else ''}" +DEPENDS_append_rcar-gen3 = "${@ ' gles-user-module' if '${USE_GLES_WAYLAND}' == '1' else ''}" diff --git a/meta-rcar-gen3/recipes-graphics/cogl/cogl-1.0_1.%.bbappend b/meta-rcar-gen3/recipes-graphics/cogl/cogl-1.0_1.%.bbappend index f06b451..12a5417 100644 --- a/meta-rcar-gen3/recipes-graphics/cogl/cogl-1.0_1.%.bbappend +++ b/meta-rcar-gen3/recipes-graphics/cogl/cogl-1.0_1.%.bbappend @@ -1,4 +1,4 @@ require include/gles-control.inc -DEPENDS_append = " \ +DEPENDS_append_rcar-gen3 = " \ ${@'gles-user-module libgbm' if '${USE_GLES_WAYLAND}' == '1' else ''} \ " diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend index 179651b..b76ff81 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-conf.bbappend @@ -1,11 +1,11 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" -SRC_URI = " \ +SRC_URI_rcar-gen3 = " \ file://weston.ini \ file://weston.sh \ " -do_install_append() { +do_install_append_rcar-gen3() { install -d ${D}/${sysconfdir}/xdg/weston # install weston.ini as sample settings of gl-renderer install -m 644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/ @@ -29,6 +29,6 @@ do_install_append() { install -m 0755 ${WORKDIR}/weston.sh ${D}/${sysconfdir}/profile.d/weston.sh } -FILES_${PN}_append = " \ +FILES_${PN}_append_rcar-gen3 = " \ ${sysconfdir}/profile.d/weston.sh \ " diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend index dafc033..58dd3b9 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-init.bbappend @@ -1,6 +1,6 @@ require include/gles-control.inc -do_install_append() { +do_install_append_rcar-gen3() { if [ "X${USE_GLES}" = "X1" ]; then sed -e "/RequiresMountsFor=\/run/a After=dbus.service multi-user.target" \ -e "s/\$OPTARGS/--idle-time=0 \$OPTARGS/" \ diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend index c1cc206..b87603b 100644 --- a/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend +++ b/meta-rcar-gen3/recipes-graphics/wayland/weston_%.bbappend @@ -2,15 +2,15 @@ require include/gles-control.inc require include/multimedia-control.inc PACKAGECONFIG_remove_virtclass-multilib-lib32 = "launch" -DEPENDS_append = " \ +DEPENDS_append_rcar-gen3 = " \ ${@oe.utils.conditional('USE_GLES', '1', ' libgbm', '', d)}" -RDEPENDS_${PN}_append = " \ +RDEPENDS_${PN}_append_rcar-gen3 = " \ ${@oe.utils.conditional('USE_GLES', '1', ' libgbm', '', d)} \ " -RDEPENDS_${PN}-examples_append = " \ +RDEPENDS_${PN}-examples_append_rcar-gen3 = " \ ${@oe.utils.conditional('USE_GLES', '1', ' libgbm', '', d)}" -EXTRA_OECONF_append = " \ +EXTRA_OECONF_append_rcar-gen3 = " \ ${@oe.utils.conditional('USE_GLES', '1', '', \ ' WESTON_NATIVE_BACKEND="fbdev-backend.so"', d)}" diff --git a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend index cfc2714..c51bcd5 100644 --- a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend +++ b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_%.bbappend @@ -1,3 +1,3 @@ # Glamor for Xorg requires gbm >= 10.2.0. # Glamor is not necessary with current env, so disable it. -PACKAGECONFIG_remove = "glamor" +PACKAGECONFIG_remove_rcar-gen3 = "glamor" |