From acbae7dc3d56800e68700b8f14515db6c34d337f Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Mon, 5 Jun 2023 13:56:35 +0200 Subject: Use new weston-ini-conf scheme and remove old per-machine files The previous commit used an old file. Use the new generated version. Bug-AGL: SPEC-4822 Change-Id: Ic1b7018ce2840332c0e051101ce854b90f96ecae Signed-off-by: Jan-Simon Moeller Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/28985 Tested-by: Jenkins Job builder account --- meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb | 7 +++++++ .../recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-0.cfg | 5 +++++ .../recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-180.cfg | 6 ++++++ .../recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-270.cfg | 6 ++++++ .../recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-90.cfg | 6 ++++++ 5 files changed, 30 insertions(+) create mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-0.cfg create mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-180.cfg create mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-270.cfg create mode 100644 meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-90.cfg (limited to 'meta-agl-core') 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 f7b281e7b..2f5185dd4 100644 --- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb @@ -9,6 +9,10 @@ SRC_URI = " \ file://hdmi-a-1-90.cfg \ file://hdmi-a-1-180.cfg \ file://hdmi-a-1-270.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://remote-output.cfg.in \ file://transmitter-output.cfg.in \ file://virtual-0.cfg \ @@ -73,6 +77,9 @@ do_compile() { if echo $F | grep '^hdmi-a-1-\(90\|270\)$'; then F="hdmi-a-1-0" INVF="hdmi-a-1-180" + 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" diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-0.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-0.cfg new file mode 100644 index 000000000..4d5d51c03 --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-0.cfg @@ -0,0 +1,5 @@ +# A display is connected to HDMI-A-1 and needs to be rotated 90 degrees +# to have a proper orientation of the homescreen. For example, the 'eGalax' +# display used in some instances. +[output] +name=HDMI-A-2 diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-180.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-180.cfg new file mode 100644 index 000000000..ffdc5fe60 --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-180.cfg @@ -0,0 +1,6 @@ +# A display is connected to HDMI-A-1 and needs to be rotated 90 degrees +# to have a proper orientation of the homescreen. For example, the 'eGalax' +# display used in some instances. +[output] +name=HDMI-A-2 +transform=rotate-180 diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-270.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-270.cfg new file mode 100644 index 000000000..76fc77acd --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-270.cfg @@ -0,0 +1,6 @@ +# A display is connected to HDMI-A-1 and needs to be rotated 90 degrees +# to have a proper orientation of the homescreen. For example, the 'eGalax' +# display used in some instances. +[output] +name=HDMI-A-2 +transform=rotate-270 diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-90.cfg b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-90.cfg new file mode 100644 index 000000000..9172a1c6a --- /dev/null +++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/hdmi-a-2-90.cfg @@ -0,0 +1,6 @@ +# A display is connected to HDMI-A-1 and needs to be rotated 90 degrees +# to have a proper orientation of the homescreen. For example, the 'eGalax' +# display used in some instances. +[output] +name=HDMI-A-2 +transform=rotate-90 -- cgit 1.2.3-korg