X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl-core%2Frecipes-graphics%2Fwayland%2Fweston-ini-conf.bb;h=574f89f2b68aa71157cb7dfb82a5e78160ab4561;hb=fdafcbbfbc82a0f6935d19f1b5a3872416b83224;hp=f4c5c72f97daeb54d91c7e30b5279517e5e65b45;hpb=48fd4407babad2df5dba0aeb57c832a9ab531c0d;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
index f4c5c72f9..574f89f2b 100644
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -9,10 +9,15 @@ SRC_URI = " \
 	file://hdmi-a-1-90.cfg \
 	file://hdmi-a-1-180.cfg \
 	file://hdmi-a-1-270.cfg \
-	file://remote-output.cfg \
+	file://hdmi-a-2-0.cfg \
+	file://hdmi-a-2-90.cfg \
+	file://hdmi-a-2-180.cfg \
+	file://hdmi-a-2-270.cfg \
 	file://virtual-0.cfg \
+	file://virtual-90.cfg \
 	file://virtual-180.cfg \
 	file://virtual-270.cfg \
+	file://grpc-proxy.cfg \
 "
 
 S = "${WORKDIR}"
@@ -20,12 +25,12 @@ S = "${WORKDIR}"
 inherit update-alternatives
 
 # Default primary display/orientation fragment
-WESTON_DISPLAYS ?= "hdmi-a-1-270"
+WESTON_DISPLAYS ?= "hdmi-a-1-90"
 
 # Configuration fragments to use in weston.ini.*
 # Note that some may be replaced/removed when building the landscape
 # configuration.
-WESTON_FRAGMENTS = "core shell ${WESTON_DISPLAYS}"
+WESTON_FRAGMENTS = "core shell grpc-proxy ${WESTON_DISPLAYS}"
 
 # On-target weston.ini directory
 weston_ini_dir = "${sysconfdir}/xdg/weston"
@@ -40,16 +45,22 @@ do_compile() {
     done
     sed -i -e '$ d' ${WORKDIR}/weston.ini.default
 
+    cat ${WORKDIR}/weston.ini.default > ${WORKDIR}/weston.ini.default-no-activate
+
     # Do it again, but filter fragments to configure for landscape
     # and a corresponding landscape-inverted that is 180 degrees
     # rotated.
     rm -f ${WORKDIR}/weston.ini.landscape
+    rm -f ${WORKDIR}/weston.ini.landscape-inverted
     for F in ${WESTON_FRAGMENTS}; do
         INVF=$F
         if echo $F | grep '^hdmi-a-1-\(90\|270\)$'; then
             F="hdmi-a-1-0"
             INVF="hdmi-a-1-180"
-        elif echo $F | grep '^virtual-270$'; then
+        elif echo $F | grep '^hdmi-a-2-\(90\|270\)$'; then
+            F="hdmi-a-2-0"
+            INVF="hdmi-a-2-180"
+        elif echo $F | grep '^virtual-90$'; then
             F="virtual-0"
             INVF="virtual-180"
         fi
@@ -60,11 +71,15 @@ do_compile() {
     done
     sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape
     sed -i -e '$ d' ${WORKDIR}/weston.ini.landscape-inverted
+
+    cat ${WORKDIR}/weston.ini.landscape > ${WORKDIR}/weston.ini.landscape-no-activate
 }
 
-do_install_append() {
+do_install:append() {
     install -d ${D}${weston_ini_dir}
     install -m 0644 ${WORKDIR}/weston.ini.default ${D}${weston_ini_dir}/
+    install -m 0644 ${WORKDIR}/weston.ini.default-no-activate ${D}${weston_ini_dir}/
+    install -m 0644 ${WORKDIR}/weston.ini.landscape-no-activate ${D}${weston_ini_dir}/
     install -m 0644 ${WORKDIR}/weston.ini.landscape ${D}${weston_ini_dir}/
     install -m 0644 ${WORKDIR}/weston.ini.landscape-inverted ${D}${weston_ini_dir}/
 }
@@ -80,28 +95,44 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini"
 
-RDEPENDS_${PN} = "weston-init"
-RPROVIDES_${PN} = "weston-ini"
-RCONFLICTS_${PN} = "${PN}-landscape"
-ALTERNATIVE_${PN} = "weston.ini"
+RPROVIDES:${PN} = "weston-ini"
+ALTERNATIVE:${PN} = "weston.ini"
 ALTERNATIVE_TARGET_${PN} = "${weston_ini_dir}/weston.ini.default"
 
-PACKAGE_BEFORE_PN += "${PN}-landscape"
-
-FILES_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
+# landscape
 
-RDEPENDS_${PN}-landscape = "weston-init"
-RPROVIDES_${PN}-landscape = "weston-ini"
-RCONFLICTS_${PN}-landscape = "${PN}"
-ALTERNATIVE_${PN}-landscape = "weston.ini"
+PACKAGE_BEFORE_PN += "${PN}-landscape"
+FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
+RPROVIDES:${PN}-landscape = "weston-ini"
+ALTERNATIVE:${PN}-landscape = "weston.ini"
 ALTERNATIVE_TARGET_${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
+ALTERNATIVE_PRIORITY_${PN}-landscape = "20"
 
-PACKAGE_BEFORE_PN += "${PN}-landscape-inverted"
-
-FILES_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
+# landscape-inverted
 
-RDEPENDS_${PN}-landscape-inverted = "weston-init"
-RPROVIDES_${PN}-landscape-inverted = "weston-ini"
-RCONFLICTS_${PN}-landscape-inverted = "${PN}"
-ALTERNATIVE_${PN}-landscape-inverted = "weston.ini"
+PACKAGE_BEFORE_PN += "${PN}-landscape-inverted"
+FILES:${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
+RPROVIDES:${PN}-landscape-inverted = "weston-ini"
+ALTERNATIVE:${PN}-landscape-inverted = "weston.ini"
 ALTERNATIVE_TARGET_${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
+ALTERNATIVE_PRIORITY_${PN}-landscape-inverted = "25"
+
+# no-activate, no activation by default
+PACKAGE_BEFORE_PN += "${PN}-no-activate"
+FILES:${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate"
+RPROVIDES:${PN}-no-activate = "weston-ini"
+ALTERNATIVE:${PN}-no-activate = "weston.ini"
+ALTERNATIVE_TARGET_${PN}-no-activate = "${weston_ini_dir}/weston.ini.default-no-activate"
+ALTERNATIVE_PRIORITY_${PN}-no-activate = "21"
+
+# landscape-no-activate, no activation by default
+PACKAGE_BEFORE_PN += "${PN}-landscape-no-activate"
+FILES:${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate"
+RPROVIDES:${PN}-landscape-no-activate = "weston-ini"
+ALTERNATIVE:${PN}-landscape-no-activate = "weston.ini"
+ALTERNATIVE_TARGET_${PN}-landscape-no-activate = "${weston_ini_dir}/weston.ini.landscape-no-activate"
+ALTERNATIVE_PRIORITY_${PN}-landscape-no-activate = "26"
+
+# This is a settings-only package, we do not need a development package
+# (and its fixed dependency to ${PN} being installed)
+PACKAGES:remove = "${PN}-dev ${PN}-staticdev"