From 8c56922ea5a1aad0ddbdfdc2fa839337d9f83511 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 26 Nov 2018 22:09:34 -0800 Subject: 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 Signed-off-by: Armin Kuster --- 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 6ebf3c798c..3a88f12ec8 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" -- cgit 1.2.3-korg