Document r/o and r/w PRserv and HASHserv in the templates

This adds sections for the PRserv and HASHserv in the local.conf templates (for r/o upstream).
Also we add comments to the r/w part that is reserved for CI.

Change-Id: Id39b11bc9664b441f5dcae3646259401b5d9a6aa
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Reviewed-on: https://gerrit.automotivelinux.org/gerrit/c/AGL/meta-agl/+/29941
ci-image-build: Jenkins Job builder account
ci-image-boot-test: Jenkins Job builder account
Tested-by: Jenkins Job builder account

diff --git a/meta-agl-core/conf/distro/poky-agl.conf b/meta-agl-core/conf/distro/poky-agl.conf
index f33ba8c..e594a0a 100644 (file)
--- a/meta-agl-core/conf/distro/poky-agl.conf
+++ b/meta-agl-core/conf/distro/poky-agl.conf
@@ -11,7 +11,7 @@ DISTRO_NAME = "Automotive Grade Linux"
 # Release flags
 DISTRO_CODENAME = "quillback"
 AGL_BRANCH = "quillback"
-AGLVERSION = "17.0.1"
+AGLVERSION = "17.0.2"
 
 # switch  devel/release
 #AGLRELEASETYPE ?= "agldevelopment"
@@ -29,8 +29,8 @@ DISTRO_BRANCH_VERSION_TAG = "${DISTRO_CODENAME}/${@'${DISTRO_VERSION}'.replace('
 # reproducible builds:
 # Set the desired timestamps
 # E.g. update for (major) releases
-export SOURCE_DATE_EPOCH = "1712000000"
-REPRODUCIBLE_TIMESTAMP_ROOTFS = "1712000000"
+export SOURCE_DATE_EPOCH = "1715000000"
+REPRODUCIBLE_TIMESTAMP_ROOTFS = "1715000000"
 
 
 # SDK

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 0611ec5..574f89f 100644 (file)
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bb
@@ -13,7 +13,6 @@ SRC_URI = " \
        file://hdmi-a-2-90.cfg \
        file://hdmi-a-2-180.cfg \
        file://hdmi-a-2-270.cfg \
-       file://remote-output.cfg.in \
        file://virtual-0.cfg \
        file://virtual-90.cfg \
        file://virtual-180.cfg \
@@ -36,18 +35,6 @@ WESTON_FRAGMENTS = "core shell grpc-proxy ${WESTON_DISPLAYS}"
 # On-target weston.ini directory
 weston_ini_dir = "${sysconfdir}/xdg/weston"
 
-# Options for the user to change in local.conf
-# e.g. REMOTING_OUTPUT_MODE = "1080x1488"
-REMOTING_OUTPUT_MODE ??= "640x720@30"
-REMOTING_OUTPUT_HOST ??= "192.168.10.3"
-REMOTING_OUTPUT_PORT ??= "5005"
-
-do_configure() {
-    sed -e "s#host=.*#host=${REMOTING_OUTPUT_HOST}#" \
-        -e "s#port=.*#port=${REMOTING_OUTPUT_PORT}#" \
-        ${WORKDIR}/remote-output.cfg.in  > ${WORKDIR}/remote-output.cfg
-}
-
 do_compile() {
     # Put all of our cfg files together for a default portrait
     # orientation configuration
@@ -109,47 +96,42 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 ALTERNATIVE_LINK_NAME[weston.ini] = "${weston_ini_dir}/weston.ini"
 
 RPROVIDES:${PN} = "weston-ini"
-RCONFLICTS:${PN} = "${PN}-landscape"
 ALTERNATIVE:${PN} = "weston.ini"
 ALTERNATIVE_TARGET_${PN} = "${weston_ini_dir}/weston.ini.default"
 
-PACKAGE_BEFORE_PN += "${PN}-landscape"
+# landscape
 
+PACKAGE_BEFORE_PN += "${PN}-landscape"
 FILES:${PN}-landscape = "${weston_ini_dir}/weston.ini.landscape"
-
 RPROVIDES:${PN}-landscape = "weston-ini"
-RCONFLICTS:${PN}-landscape = "${PN}"
 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"
+# landscape-inverted
 
+PACKAGE_BEFORE_PN += "${PN}-landscape-inverted"
 FILES:${PN}-landscape-inverted = "${weston_ini_dir}/weston.ini.landscape-inverted"
-
 RPROVIDES:${PN}-landscape-inverted = "weston-ini"
-RCONFLICTS:${PN}-landscape-inverted = "${PN}"
 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 activation by default
+# 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"
-RCONFLICTS:${PN}-no-activate = "${PN}"
 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 activation by default
+# 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"
-RCONFLICTS:${PN}-landscape-no-activate = "${PN}"
 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)

diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
index 746bde3..b6095f2 100644 (file)
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
+++ b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf.bbappend
@@ -2,8 +2,6 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
-WESTON_DISPLAYS:append = "${@bb.utils.contains("DISTRO_FEATURES", "weston-remoting", " remote-output", "", d)}"
-
 # For virtual machines and intel-corei7-64 we want to support both the HDMI-A-1
 # and Virtual-1 outputs. This allows us to run virtual images on real hardware
 # and vice versa.

diff --git a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in b/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in
deleted file mode 100644 (file)
index 940cbdd..0000000
--- a/meta-agl-core/recipes-graphics/wayland/weston-ini-conf/remote-output.cfg.in
+++ /dev/null
@@ -1,5 +0,0 @@
-[remote-output]
-name=remote-1
-mode=640x720@30
-host=192.168.10.3
-port=5005

diff --git a/templates/base/local.conf.sample b/templates/base/local.conf.sample
index 7f2c0b1..bc55b3d 100644 (file)
--- a/templates/base/local.conf.sample
+++ b/templates/base/local.conf.sample
@@ -280,9 +280,14 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 #
 # A shared hash equivalent server can be set with "<HOSTNAME>:<PORT>" format
 #
+# local only
 #BB_HASHSERVE = "auto"
 #BB_SIGNATURE_HANDLER = "OEEquivHash"
-
+#
+# online/upstream r/o
+#AGL_HOST_HASHSERV = "prserv.automotivelinux.org"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
+#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8484"
 
 # The network based PR service host and port
 # Uncomment the following lines to enable PRservice.
@@ -290,6 +295,10 @@ PACKAGECONFIG:append:pn-qemu-system-native = " sdl"
 # start local PRService.
 # Set to other values to use remote PRService.
 #PRSERV_HOST = "localhost:0"
+#
+# r/o upstream prserv
+#AGL_HOST_PRSERV = "prserv.automotivelinux.org"
+#PRSERV_HOST = "prserv.automotivelinux.org:8282"
 
 
 # Archive the source and put them to ${DEPLOY_DIR}/sources/.

diff --git a/templates/feature/agl-ci/99_local.conf.inc b/templates/feature/agl-ci/99_local.conf.inc
index ef14cd8..06402ef 100644 (file)
--- a/templates/feature/agl-ci/99_local.conf.inc
+++ b/templates/feature/agl-ci/99_local.conf.inc
@@ -21,12 +21,18 @@ INHERIT += "buildstats"
 INHERIT += "buildstats-summary"
 
 # setup for PRSERV and HASHSERV
-AGL_HOST_PRSERV ?= "10.30.72.18"
-AGL_HOST_HASHSERV ?= "10.30.72.18"
+#AGL_HOST_PRSERV ?= "10.30.72.18"
+#AGL_HOST_HASHSERV ?= "10.30.72.18"
 
-BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383"
-BB_SIGNATURE_HANDLER = "OEEquivHash"
+# r/w hashserv
+#BB_HASHSERVE = "${AGL_HOST_HASHSERV}:8383"
+#BB_SIGNATURE_HANDLER = "OEEquivHash"
 
-PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
+# r/w prserv
+#PRSERV_HOST = "${AGL_HOST_PRSERV}:8181"
 
 IMAGE_INSTALL:append = " curl"
+
+# disable lttng due to build errors
+LTTNGMODULES:forcevariable = ""
+LTTNGTOOLS:forcevariable = ""

diff --git a/templates/feature/agl-weston-remoting/included.dep b/templates/feature/agl-weston-remoting/included.dep
deleted file mode 100644 (file)
index 82639da..0000000
--- a/templates/feature/agl-weston-remoting/included.dep
+++ /dev/null
@@ -1 +0,0 @@
-agl-demo