diff options
| author | Baeuerle, Florian <Florian.Baeuerle@allegion.com> | 2019-02-20 15:07:53 +0000 |
|---|---|---|
| committer | Michael Olbrich <m.olbrich@pengutronix.de> | 2019-02-26 09:13:04 +0100 |
| commit | ebc96f9c97de4d3db08104de82c181b00b02a794 (patch) | |
| tree | a58970d6de93a11e69b54003b621101aa5421ee5 /rules | |
| parent | 2f88d0401bc3398a0a164c7391d0088dff86c9d3 (diff) | |
| download | ptxdist-ebc96f9c97de4d3db08104de82c181b00b02a794.tar.gz ptxdist-ebc96f9c97de4d3db08104de82c181b00b02a794.tar.xz | |
fontconfig: untangle from xorg-fonts
The rc-once fc-cache drop-in used to be installed via the xorg-fonts
package, which can be undesirable when using collections in combination
with image packages. Untangle the packages by installing the rc-once
drop-in via the fontconfig package.
Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
[mol: move 'select' to toplevel option]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/fontconfig.in | 4 | ||||
| -rw-r--r-- | rules/fontconfig.make | 2 | ||||
| -rw-r--r-- | rules/fontconfig.postinst (renamed from rules/xorg-fonts.postinst) | 0 | ||||
| -rw-r--r-- | rules/graphics_and_multimedia.in | 6 | ||||
| -rw-r--r-- | rules/xorg-fonts.make | 3 |
5 files changed, 5 insertions, 10 deletions
diff --git a/rules/fontconfig.in b/rules/fontconfig.in index ba5dee42e..61f4b8842 100644 --- a/rules/fontconfig.in +++ b/rules/fontconfig.in @@ -7,6 +7,7 @@ menuconfig FONTCONFIG select FREETYPE select EXPAT select LIBUUID + select RC_ONCE if FONTCONFIG_UTILS && RUNTIME help Fontconfig is a font configuration and customization library, which does not depend on @@ -23,7 +24,8 @@ menuconfig FONTCONFIG if FONTCONFIG config FONTCONFIG_UTILS - bool "install utilities for Fontconfig " + bool + prompt "install utilities for Fontconfig " help The fontconfig utilities package contains fc-list, fc-match, and fc-cache. diff --git a/rules/fontconfig.make b/rules/fontconfig.make index 4fa04440b..3bc10dc45 100644 --- a/rules/fontconfig.make +++ b/rules/fontconfig.make @@ -80,6 +80,8 @@ ifdef PTXCONF_FONTCONFIG_UTILS @$(call install_copy, fontconfig, 0, 0, 0755, -, \ /usr/bin/fc-match) + + @$(call install_alternative, fontconfig, 0, 0, 0755, /etc/rc.once.d/fc-cache) endif @$(call install_finish, fontconfig) diff --git a/rules/xorg-fonts.postinst b/rules/fontconfig.postinst index 0041746d0..0041746d0 100644 --- a/rules/xorg-fonts.postinst +++ b/rules/fontconfig.postinst diff --git a/rules/graphics_and_multimedia.in b/rules/graphics_and_multimedia.in index 25fb44a79..d5de2f6d0 100644 --- a/rules/graphics_and_multimedia.in +++ b/rules/graphics_and_multimedia.in @@ -20,12 +20,6 @@ config XORG_FONTS select HOST_XORG_APP_MKFONTSCALE select HOST_XORG_APP_BDFTOPCF select HOST_XORG_FONT_UTIL - select RC_ONCE if XORG_FONTS_FC_CACHE && RUNTIME - -config XORG_FONTS_FC_CACHE - default FONTCONFIG - select FONTCONFIG_UTILS - tristate config XORG_FONTS_QT4_LINKS depends on QT4_PLATFORM_EMBEDDED diff --git a/rules/xorg-fonts.make b/rules/xorg-fonts.make index 99d82a341..e0f06ee29 100644 --- a/rules/xorg-fonts.make +++ b/rules/xorg-fonts.make @@ -78,9 +78,6 @@ $(STATEDIR)/xorg-fonts.targetinstall.post: $(XORG_FONTS_DIR_INSTALL)/$$file, \ $(XORG_FONTDIR)/$$file, n); \ done -ifdef PTXCONF_XORG_FONTS_FC_CACHE - @$(call install_alternative, xorg-fonts, 0, 0, 0755, /etc/rc.once.d/fc-cache) -endif ifdef PTXCONF_XORG_FONTS_QT4_LINKS @cd $(XORG_FONTS_DIR_INSTALL) && \ find . -type f | while read file; do \ |