weston-ini-conf: Fix task signatures, mark as machine-specific package

We need to do two things here.  First, 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.  This change comes directly from
master.  The second thing is that we need to tell bitbake/OpenEmbedded
that this is a machine-specific package not architecture-generic.

Bug-AGL: SPEC-965
Change-Id: I748dbf40f37aaf7f4a6dd6ddd65257fdfcf83098
Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/11355
Tested-by: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-build: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
ci-image-boot-test: Jenkins Job builder account <agl-jobbuilder@automotivelinux.org>
Reviewed-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>

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 e736ddd..14f4c27 100644 (file)
--- 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-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-bsp/meta-raspberrypi/recipes-graphics/wayland/weston-ini-conf.bbappend
index 14b858d..37383c2 100644 (file)
--- 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 e46b10e..661af2b 100644 (file)
--- 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 7a54dfb..4a04948 100644 (file)
--- 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/weston-ini-conf.bb b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
index 986a9ed..918257d 100644 (file)
--- a/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl/recipes-graphics/wayland/weston-ini-conf.bb
@@ -4,6 +4,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
 
 S = "${WORKDIR}"
 
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
 require weston-ini-conf/screen.inc
 
 DEFAULT_SCREEN[transform]?="270"
@@ -50,6 +52,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 d5d91bf..e0b39b3 100644 (file)
--- 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 d82b180..846e059 100644 (file)
--- 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 051e2ee..9d41191 100644 (file)
--- 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_qemu.inc b/meta-agl/recipes-graphics/wayland/weston-ini-conf/screen_qemu.inc
index 76dd8b8..c7f3abe 100644 (file)
--- 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"