5 files changed, 43 insertions, 34 deletions
diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-weston.bbappend b/meta-rcar-gen3/recipes-graphics/images/core-image-weston.bbappend
index e30bc2e..9bca7ad 100644
--- a/meta-rcar-gen3/recipes-graphics/images/core-image-weston.bbappend
+++ b/meta-rcar-gen3/recipes-graphics/images/core-image-weston.bbappend
@@ -1,2 +1,4 @@
 require core-image-renesas-base.inc
 require core-image-weston.inc
+
+CORE_IMAGE_BASE_INSTALL += "weston-ini-conf"
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bb b/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bb
new file mode 100644
index 0000000..5f5c49f
--- /dev/null
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bb
@@ -0,0 +1,41 @@
+LICENSE = "MIT"
+
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+
+SRC_URI = " \
+    file://weston.ini \
+    file://weston_v4l2.ini \
+"
+
+do_install_append() {
+    install -d ${D}/${sysconfdir}/xdg/weston
+    if [ "X${USE_MULTIMEDIA}" = "X1" ]; then
+        # install weston.ini as sample settings of v4l2-renderer
+        if [ "${MACHINE}" = "m3ulcb" -o "${MACHINE}" = "h3ulcb" ] ; then
+            sed -i 's|media1|media0|g' ${WORKDIR}/weston_v4l2.ini
+        fi
+        install -m 644 ${WORKDIR}/weston_v4l2.ini ${D}/${sysconfdir}/xdg/weston/weston.ini
+    else
+        # install weston.ini as sample settings of gl-renderer
+        install -m 644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/
+    fi
+
+    # Checking for ivi-shell configuration
+    # If ivi-shell is enable, we will add its configs to weston.ini
+    if [ "X${USE_WAYLAND_IVI_SHELL}" = "X1" ]; then
+        sed -i '/repaint-window=34/c\repaint-window=34\nshell=ivi-shell.so' \
+            ${D}/${sysconfdir}/xdg/weston/weston.ini
+        sed -e '$a\\' \
+            -e '$a\[ivi-shell]' \
+            -e '$a\ivi-module=ivi-controller.so' \
+            -e '$a\ivi-input-module=ivi-input-controller.so' \
+            -e '$a\transition-duration=300' \
+            -e '$a\cursor-theme=default' \
+            -i ${D}/${sysconfdir}/xdg/weston/weston.ini
+    fi
+}
+
+FILES_${PN}_append = " \
+    ${sysconfdir}/xdg/weston/weston.ini \
+"
+
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini b/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/weston.ini
index f31c290..f31c290 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston/weston.ini
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/weston.ini
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston/weston_v4l2.ini b/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/weston_v4l2.ini
index 8e2e70f..8e2e70f 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston/weston_v4l2.ini
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf/weston_v4l2.ini
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/weston_1.11.0.bbappend b/meta-rcar-gen3/recipes-graphics/wayland/weston_1.11.0.bbappend
index 65e8fe8..bbb79ed 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/weston_1.11.0.bbappend
+++ b/meta-rcar-gen3/recipes-graphics/wayland/weston_1.11.0.bbappend
@@ -10,8 +10,6 @@ SRC_URI_remove = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz"
 
 SRC_URI_append = " \
     git://github.com/renesas-rcar/weston.git;branch=${BRANCH} \
-    file://weston.ini \
-    file://weston_v4l2.ini \
 "
 
 S = "${WORKDIR}/git"
@@ -20,35 +18,3 @@ PACKAGECONFIG_append = " \
     ${@base_conditional('USE_MULTIMEDIA', '1', ' v4l2', '', d)} \
 "
 PACKAGECONFIG[v4l2] = " --enable-v4l2, --disable-v4l2,,kernel-module-vsp2driver"
-
-do_install_append() {
-    install -d ${D}/${sysconfdir}/xdg/weston
-    if [ "X${USE_MULTIMEDIA}" = "X1" ]; then
-        # install weston.ini as sample settings of v4l2-renderer
-        if [ "${MACHINE}" = "m3ulcb" -o "${MACHINE}" = "h3ulcb" ] ; then
-            sed -i 's|media1|media0|g' ${WORKDIR}/weston_v4l2.ini
-        fi
-        install -m 644 ${WORKDIR}/weston_v4l2.ini ${D}/${sysconfdir}/xdg/weston/weston.ini
-    else
-        # install weston.ini as sample settings of gl-renderer
-        install -m 644 ${WORKDIR}/weston.ini ${D}/${sysconfdir}/xdg/weston/
-    fi
-
-    # Checking for ivi-shell configuration
-    # If ivi-shell is enable, we will add its configs to weston.ini
-    if [ "X${USE_WAYLAND_IVI_SHELL}" = "X1" ]; then
-        sed -i '/repaint-window=34/c\repaint-window=34\nshell=ivi-shell.so' \
-            ${D}/${sysconfdir}/xdg/weston/weston.ini
-        sed -e '$a\\' \
-            -e '$a\[ivi-shell]' \
-            -e '$a\ivi-module=ivi-controller.so' \
-            -e '$a\ivi-input-module=ivi-input-controller.so' \
-            -e '$a\transition-duration=300' \
-            -e '$a\cursor-theme=default' \
-            -i ${D}/${sysconfdir}/xdg/weston/weston.ini
-    fi
-}
-
-FILES_${PN}_append = " \
-    ${sysconfdir}/xdg/weston/weston.ini \
-"