diff options
author | Khem Raj <raj.khem@gmail.com> | 2018-11-26 22:09:34 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2018-11-27 11:05:22 -0800 |
commit | 4cd60756064adf3a852112857dc7b05314968dfd (patch) | |
tree | 273b3c6247c3faf40f47a3c16d4cfcfd633b8924 | |
parent | 23acce81f49c539fee668dc7405d6a1f51792062 (diff) | |
download | meta-openembedded-4cd60756064adf3a852112857dc7b05314968dfd.tar.gz |
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@gmail.com>
-rw-r--r-- | meta-oe/recipes-graphics/xscreensaver/xscreensaver_5.39.bb | 4 |
1 files changed, 4 insertions, 0 deletions
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" | |||
19 | 19 | ||
20 | inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check | 20 | inherit systemd perlnative pkgconfig gettext autotools-brokensep distro_features_check |
21 | 21 | ||
22 | EXTRA_OECONF += "--with-x-app-defaults=${datadir}/X11/app-defaults" | ||
23 | |||
22 | REQUIRED_DISTRO_FEATURES = "x11" | 24 | REQUIRED_DISTRO_FEATURES = "x11" |
23 | 25 | ||
24 | do_install_append() { | 26 | do_install_append() { |
@@ -27,3 +29,5 @@ do_install_append() { | |||
27 | 29 | ||
28 | FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" | 30 | FILES_${PN} += "${datadir}/X11/app-defaults/XScreenSaver" |
29 | SYSTEMD_SERVICE_${PN} = "xscreensaver.service" | 31 | SYSTEMD_SERVICE_${PN} = "xscreensaver.service" |
32 | |||
33 | CLEANBROKEN = "1" | ||