diff options
-rw-r--r-- | meta/classes/fontcache.bbclass | 4 | ||||
-rw-r--r-- | meta/conf/documentation.conf | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | 1 | ||||
-rw-r--r-- | meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index 325bcae58f..afd3fd2252 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass | |||
@@ -7,6 +7,7 @@ DEPENDS += "qemu-native" | |||
7 | inherit qemu | 7 | inherit qemu |
8 | 8 | ||
9 | FONT_PACKAGES ??= "${PN}" | 9 | FONT_PACKAGES ??= "${PN}" |
10 | FONT_EXTRA_RDEPENDS ?= "fontconfig-utils" | ||
10 | 11 | ||
11 | fontcache_common() { | 12 | fontcache_common() { |
12 | if [ "x$D" != "x" ] ; then | 13 | if [ "x$D" != "x" ] ; then |
@@ -19,8 +20,11 @@ fi | |||
19 | 20 | ||
20 | python populate_packages_append() { | 21 | python populate_packages_append() { |
21 | font_pkgs = d.getVar('FONT_PACKAGES', True).split() | 22 | font_pkgs = d.getVar('FONT_PACKAGES', True).split() |
23 | deps = d.getVar("FONT_EXTRA_RDEPENDS", True) | ||
22 | 24 | ||
23 | for pkg in font_pkgs: | 25 | for pkg in font_pkgs: |
26 | if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps) | ||
27 | |||
24 | bb.note("adding fonts postinst and postrm scripts to %s" % pkg) | 28 | bb.note("adding fonts postinst and postrm scripts to %s" % pkg) |
25 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) | 29 | postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) |
26 | if not postinst: | 30 | if not postinst: |
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf index 53c3da23a7..4d49a02ece 100644 --- a/meta/conf/documentation.conf +++ b/meta/conf/documentation.conf | |||
@@ -173,6 +173,7 @@ FILESEXTRAPATHS[doc] = "Extends the search path the OpenEmbedded build system us | |||
173 | FILESOVERRIDES[doc] = "A subset of OVERRIDES used by the OpenEmbedded build system for creating FILESPATH." | 173 | FILESOVERRIDES[doc] = "A subset of OVERRIDES used by the OpenEmbedded build system for creating FILESPATH." |
174 | FILESPATH[doc] = "The default set of directories the OpenEmbedded build system uses when searching for patches and files. It is defined in the base.bbclass class found in meta/classes in the Source Directory. Do not hand-edit the FILESPATH variable." | 174 | FILESPATH[doc] = "The default set of directories the OpenEmbedded build system uses when searching for patches and files. It is defined in the base.bbclass class found in meta/classes in the Source Directory. Do not hand-edit the FILESPATH variable." |
175 | FILESYSTEM_PERMS_TABLES[doc] = "Allows you to define your own file permissions settings table as part of your configuration for the packaging process." | 175 | FILESYSTEM_PERMS_TABLES[doc] = "Allows you to define your own file permissions settings table as part of your configuration for the packaging process." |
176 | FONT_EXTRA_RDEPENDS[doc] = "When a recipe inherits the fontcache class, this variable specifies runtime dependencies for font packages. This variable defaults to 'fontconfig-utils'." | ||
176 | FONT_PACKAGES[doc] = "When a recipe inherits the fontcache class, this variable identifies packages containing font files that need to be cached by Fontconfig." | 177 | FONT_PACKAGES[doc] = "When a recipe inherits the fontcache class, this variable identifies packages containing font files that need to be cached by Fontconfig." |
177 | FULL_OPTIMIZATION[doc]= "The options to pass in TARGET_CFLAGS and CFLAGS when compiling an optimized system. This variable defaults to '-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2'." | 178 | FULL_OPTIMIZATION[doc]= "The options to pass in TARGET_CFLAGS and CFLAGS when compiling an optimized system. This variable defaults to '-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2'." |
178 | 179 | ||
diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb index c99521f9b6..89fa4b211d 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb | |||
@@ -8,7 +8,6 @@ BUGTRACKER = "https://bugzilla.redhat.com/" | |||
8 | SECTION = "x11/fonts" | 8 | SECTION = "x11/fonts" |
9 | LICENSE = "GPLv2" | 9 | LICENSE = "GPLv2" |
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" |
11 | RDEPENDS_${PN} = "fontconfig-utils" | ||
12 | PR = "r4" | 11 | PR = "r4" |
13 | PE = "1" | 12 | PE = "1" |
14 | 13 | ||
diff --git a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index 75f78a2745..b2e4cef39d 100644 --- a/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb | |||
@@ -8,7 +8,6 @@ SECTION = "x11/fonts" | |||
8 | LICENSE = "BitstreamVera" | 8 | LICENSE = "BitstreamVera" |
9 | LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" | 9 | LIC_FILES_CHKSUM = "file://COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be" |
10 | PR = "r7" | 10 | PR = "r7" |
11 | RDEPENDS_${PN} = "fontconfig-utils" | ||
12 | 11 | ||
13 | inherit fontcache | 12 | inherit fontcache |
14 | 13 | ||