[oe-commits] [meta-openembedded] 10/12: xscreensaver: Define consistent app-defaults dir

git at git.openembedded.org git at git.openembedded.org
Tue Nov 27 19:05:59 UTC 2018


This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 4cd60756064adf3a852112857dc7b05314968dfd
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Mon Nov 26 22:09:34 2018 -0800

    xscreensaver: Define consistent app-defaults dir
    
    This is otherwise detected based on host machines X11 install directory
    and on builders where x11 may not be insalled this will default to
    another directory /usr/lib/X11/.. instead of /usr/share/X11...
    
    This patch makes it consistent and avoids poking at host machines
    install
    
    make clean does not work so enable CLEANBROKEN
    
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
index 6ebf3c7..3a88f12 100644
--- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
+++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb
@@ -19,6 +19,8 @@ RDEPENDS_${PN} += "xserver-nodm-init liberation-fonts"
 
 inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check
 
+EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults"
+
 REQUIRED_DISTRO_FEATURES = "x11"
 
 do_install_append() {
@@ -27,3 +29,5 @@ do_install_append() {
 
 FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver"
 SYSTEMD_SERVICE_${PN} = "xscreensaver.service"
+
+CLEANBROKEN = "1"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list