weston-ini-conf: Make this track variables correctly for signatures

bitbake does not know to track values that are found and used via
getVarFlags() without them being otherwise refernced and tracked in ways
that are otherwise caught.  Further given that we use multiple levels of
varflags here we need to be explicit in their tracking.  Add all
variables that we use to varflags where they are added to the metadata.

Bug-AGL: SPEC-939
Change-Id: I32cf16c4354d733e086c6ea9a845934beff94715
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11255
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Tested-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

12 files changed, 18 insertions, 8 deletions

diff --git a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf.bbappend
index e736dddd2..14f4c2736 100644
--- a/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-freescale-layer/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -7,3 +7,4 @@ SCREEN_fbdev[name] = "fbdev"
 SCREEN_fbdev[transform] = "270"
 WESTONOUTPUT1[agl_screen] = "SCREEN_fbdev"
 
+do_generate_weston_init[vardeps] += "SCREEN_fbdev"
diff --git a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston-ini-conf.bbappend
index fb3f1ac32..731578e39 100644
--- a/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-intel/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -1,8 +1,4 @@
 # Select default screen type and orientation
 # and only one default output
 
-# Note when such change is applied it will not be taken due to a Yocto cache error
-# Fix:
-# bitbake weston-ini-conf -c clean ; bitbake weston-ini-conf -c cleansstate
-
 WESTONOUTPUT1[agl_screen] = "SCREEN_eGalax"
diff --git a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
index 14b858d45..37383c24d 100644
--- a/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -2,3 +2,5 @@
 WESTONOUTPUT2[agl_screen] ??= "SCREEN_DSI"
 
 WESTONSECTION[WESTONOUTPUT2] = "output"
+
+do_generate_weston_init[vardeps] += "WESTONOUTPUT2"
diff --git a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
index e46b10ef7..661af2b92 100644
--- a/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-rcar-gen3/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -10,3 +10,5 @@ python() {
     if "multimedia" in d.getVar("MACHINE_FEATURES", True).split(" "):
         d.setVarFlag("WESTONSECTION", "WESTONV4L2RENDERER", "v4l2-renderer")
 }
+
+do_generate_weston_init[vardeps] += "WESTONIVISHELL WESTONV4L2RENDERER"
diff --git a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend
index 7a54dfbe4..4a049482e 100644
--- a/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-bsp/meta-renesas/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -3,3 +3,5 @@ WESTONOUTPUT2[name] = "LVDS-1"
 WESTONOUTPUT2[mode] = "off"
 
 WESTONSECTION[WESTONOUTPUT2] = "output"
+
+do_generate_weston_init[vardeps] += "WESTONOUTPUT2"
diff --git a/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf b/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf
index ec658ce7d..eb30a9a96 100644
--- a/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf
+++ b/meta-agl/recipes-graphics/wayland/Readme.weston-ini-conf
@@ -1,9 +1,5 @@
 #Generate a weston.ini file:
 
-# WARNING Due to a bug in Yocto cache, changes in related bbappand are not detected
-# Work-around:
-#   bitbake weston-ini-conf -c clean ; bitbake weston-ini-conf -c cleansstate
-
 To generate the weston.ini file:
 
 '''
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
index 986a9eda9..c7eee62ce 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
@@ -50,6 +50,7 @@ python do_generate_weston_init() {
 #ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True)
 
 addtask do_generate_weston_init after do_compile before do_install
+do_generate_weston_init[vardeps] = "DEFAULT_SCREEN WESTONCORE WESTONSHELL WESTONOUTPUT1 WESTONSECTION"
 
 do_install_append() {
     WESTON_INI_CONFIG=${sysconfdir}/xdg/weston
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc
index d5d91bf68..e0b39b3a3 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_DSI.inc
@@ -1,2 +1,4 @@
 SCREEN_DSI[name] ?= "DSI-1"
 SCREEN_DSI[transform] ?= "270"
+
+do_generate_weston_init[vardeps] += "SCREEN_DSI"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc
index d82b18027..846e0592e 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_GeChic.inc
@@ -2,3 +2,5 @@ SCREEN_GECHIC[name] ?= "HDMI-A-1"
 SCREEN_GECHIC[transform] ?= "270"
 # for 1080p on GeChic 1502i:
 SCREEN_GECHIC[mode] = "173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync"
+
+do_generate_weston_init[vardeps] += "SCREEN_GECHIC"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc
index 051e2ee0d..9d4119120 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_dell.inc
@@ -1,2 +1,4 @@
 SCREEN_DELL[name]?="HDMI-A-1"
 SCREEN_DELL[transform]?="180"
+
+do_generate_weston_init[vardeps] += "SCREEN_DELL"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_eGalax.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_eGalax.inc
index 4d3649f13..ecbba19e6 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_eGalax.inc
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_eGalax.inc
@@ -1,2 +1,4 @@
 SCREEN_eGalax[name] ?= "HDMI-A-1"
 SCREEN_eGalax[transform] ?= "90"
+
+do_generate_weston_init[vardeps] += "SCREEN_eGalax"
diff --git a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc
index 76dd8b81f..c7f3abeba 100644
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc
@@ -14,3 +14,5 @@ SCREEN_QEMU[mode]?="1600x900"
 #mode=800x600
 #mode=848x480
 #mode=640x480
+
+do_generate_weston_init[vardeps] += "SCREEN_QEMU"