TigerVNC compiles its own xserver from a separate tarball, it doesn't use oe-core's xserver for most of the compilation.
The vendored xserver code should be still kept in sync with oe-core to minimize incompatibilities, feature and bug-discrepepancies (...) However it is easy to miss when xserver is updated in oe-core, TigerVNC's xserver gets out of sync frequently. This change adds a small check before do_configure that compares the vendored and oe-core's xserver version, and issues a warning if TigerVNC recipe needs to be synced to oe-core. Signed-off-by: Gyorgy Sarvari <[email protected]> --- meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb index 53832939e1..dd4957fe6e 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.15.0.bb @@ -44,6 +44,16 @@ do_patch_xserver () { patch -p1 -b --suffix .vnc --directory ${XSERVER_SOURCE_DIR} <${S}/unix/xserver21.patch } +# It is very easy to miss xserver updates in oe-core, and this recipe's xserver +# gets out of sync due to this. Hopefully this warning will help. +do_configure[prefuncs] += "do_verify_xserver_version" +do_verify_xserver_version() { + OE_CORE_XSERVER_VERSION=$(pkg-config --modversion xorg-server) + if [ "$OE_CORE_XSERVER_VERSION" != "${XORG_PV}" ]; then + bbwarn "TigerVNC xorg-server version (${XORG_PV}) is different from oe-core's xorg-xserver version ($OE_CORE_XSERVER_VERSION)" + fi +} + EXTRA_OECONF = "--disable-xorg --disable-xnest --disable-xvfb \ --disable-xwin --disable-xephyr --disable-kdrive --with-pic \ --disable-static --disable-xinerama \
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#122949): https://lists.openembedded.org/g/openembedded-devel/message/122949 Mute This Topic: https://lists.openembedded.org/mt/116958121/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
