From fed50e2afcbc7c054d34e01020db2980b34530a7 Mon Sep 17 00:00:00 2001 From: Tom Hochstein Date: Mon, 4 Nov 2019 10:21:47 -0600 Subject: weston: Improve weston.ini selection logic Add a variable WESTON_INI_INSTALL_FILE to make it easy to customize the selection of the weston.ini file. The main recipe now performs only a generic install of the selected file. For AGL and IVI, we use the BBFILES_DYNAMIC mechanism to specify no file and an IVI-specific file respectively. Signed-off-by: Tom Hochstein --- recipes-graphics/wayland/weston_5.0.0.imx.bb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'recipes-graphics/wayland/weston_5.0.0.imx.bb') diff --git a/recipes-graphics/wayland/weston_5.0.0.imx.bb b/recipes-graphics/wayland/weston_5.0.0.imx.bb index 9f32d94a2..e9f354f07 100644 --- a/recipes-graphics/wayland/weston_5.0.0.imx.bb +++ b/recipes-graphics/wayland/weston_5.0.0.imx.bb @@ -102,6 +102,9 @@ PACKAGECONFIG[imxg2d] = "--enable-imxg2d,--disable-imxg2d,virtual/libg2d" # Weston with OpenGL support PACKAGECONFIG[opengl] = "--enable-opengl,--disable-opengl" +# Set to install a default weston.ini file +WESTON_INI_INSTALL_FILE = "${B}/weston.ini" + do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la @@ -120,13 +123,8 @@ do_install_append() { fi # install default weston.ini - if [ -n "${@bb.utils.filter('BBFILE_COLLECTIONS', 'aglprofilegraphical', d)}" ]; then - if [ "${@bb.utils.filter('BBFILE_COLLECTIONS', 'ivi', d)}" ]; then - WESTON_INI_SRCDIR=${B}/ivi-shell - else - WESTON_INI_SRCDIR=${B} - fi - install -D -m 0644 ${WESTON_INI_SRCDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini + if [ "${WESTON_INI_INSTALL_FILE}" != "" ]; then + install -D -m 0644 ${WESTON_INI_INSTALL_FILE} ${D}${sysconfdir}/xdg/weston/weston.ini fi } -- cgit v1.2.3-54-g00ecf