X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=recipes-graphics%2Fwayland%2Fweston-ini-conf_agldemo.inc;h=5d15d16bef0e1240b9c5b15802b57ce7c100a96c;hb=4ed1a0a0302cec13f12d3999466d62841c104402;hp=003d411cec3d3828f5c7be55f478b8a6f348c595;hpb=348df0b19d782ce4cbebc20cd17fc0b6c9d46293;p=AGL%2Fmeta-agl-demo.git

diff --git a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
index 003d411ce..5d15d16be 100644
--- a/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
+++ b/recipes-graphics/wayland/weston-ini-conf_agldemo.inc
@@ -2,43 +2,23 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/weston-ini-conf:"
 
 SRC_URI += "file://weston.ini.kvm.in"
 
-GUEST_VM1_IMAGE ?= "agl-ivi-demo-platform-flutter"
-GUEST_VM2_IMAGE ?= "agl-cluster-demo-platform-flutter"
+GUEST_VM1_IMAGE ?= "agl-ivi-demo-flutter"
+GUEST_VM2_IMAGE ?= "agl-cluster-demo-flutter"
 
 do_compile:append() {
-    # Put all of our cfg files together for a default portrait
-    # orientation configuration
-    rm -f ${WORKDIR}/weston.ini.flutter
-    for F in ${WESTON_FRAGMENTS}; do
-        cat ${WORKDIR}/${F}.cfg >> ${WORKDIR}/weston.ini.flutter
-	if grep -q '\[output\]' ${WORKDIR}/${F}.cfg; then
-            echo "activation-area=1080x1600+0,160" >> ${WORKDIR}/weston.ini.flutter
-        fi
-        echo >> ${WORKDIR}/weston.ini.flutter
-    done
-    sed -i -e '$ d' ${WORKDIR}/weston.ini.flutter
-
     # Start with a canned configuration for a KVM host, filling in
     # the guest VM application ids to pin them to specific outputs.
     rm -f ${WORKDIR}/weston.ini.kvm
     sed -e "s/@GUEST_VM1_IMAGE@/${GUEST_VM1_IMAGE}/g" \
         -e "s/@GUEST_VM2_IMAGE@/${GUEST_VM2_IMAGE}/g" \
-        ${WORKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm
+        ${UNPACKDIR}/weston.ini.kvm.in > ${WORKDIR}/weston.ini.kvm
 }
 
 do_install:append() {
-    install -m 0644 ${WORKDIR}/weston.ini.flutter ${D}${weston_ini_dir}/
     install -m 0644 ${WORKDIR}/weston.ini.kvm ${D}${weston_ini_dir}/
 }
 
-PACKAGE_BEFORE_PN += "${PN}-flutter ${PN}-kvm"
-
-FILES:${PN}-flutter = "${weston_ini_dir}/weston.ini.flutter"
-
-RPROVIDES:${PN}-flutter = "weston-ini"
-RCONFLICTS:${PN}-flutter = "${PN}"
-ALTERNATIVE:${PN}-flutter = "weston.ini"
-ALTERNATIVE_TARGET_${PN}-flutter = "${weston_ini_dir}/weston.ini.flutter"
+PACKAGE_BEFORE_PN += "${PN}-kvm"
 
 FILES:${PN}-kvm = "${weston_ini_dir}/weston.ini.kvm"