summaryrefslogtreecommitdiffstats
path: root/recipes/xorg-font
diff options
context:
space:
mode:
authorEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2010-05-27 15:14:53 +0200
committerEnrico Scholz <enrico.scholz@sigma-chemnitz.de>2010-07-15 11:38:00 +0200
commitc1968dc5ea6b0552a8ca2c9c38c51c5df0ae4917 (patch)
treef4fae8c5bd4b8c755a90a44644949b9223ff1b43 /recipes/xorg-font
parent7902e7febe13c44a6cb5452206029092fde54500 (diff)
downloadopenembedded-c1968dc5ea6b0552a8ca2c9c38c51c5df0ae4917.tar.gz
encodings/font-util: swapped inter-DEPENDS
'encodings' uses font-util's pkg-config file to determine location of the X11 font directory. When 'font-util' is not staged yet (as it was the case), it will use buildhost information which point to something like /usr/share/X11 (which is outside of the staging dir) and which are not writable. This results into an empty 'encodings' package on first bitbake run in a pristine tree; 'encodings' must be rebuilt so that it can use font-util information from previous runs. As 'font-util' itself does not require 'encodings' during build-time, there were swapped the DEPENDS. Signed-off-by: Enrico Scholz <enrico.scholz@sigma-chemnitz.de> Cc: David-John Willis <John.Willis@Distant-earth.com> Cc: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes/xorg-font')
-rw-r--r--recipes/xorg-font/encodings_1.0.3.bb4
-rw-r--r--recipes/xorg-font/font-util_1.1.1.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/recipes/xorg-font/encodings_1.0.3.bb b/recipes/xorg-font/encodings_1.0.3.bb
index 168a67a6bc..bc9583613c 100644
--- a/recipes/xorg-font/encodings_1.0.3.bb
+++ b/recipes/xorg-font/encodings_1.0.3.bb
@@ -1,8 +1,8 @@
require xorg-font-common.inc
PE = "1"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
-DEPENDS = "mkfontscale-native font-util-native"
+DEPENDS = "mkfontscale-native font-util-native font-util"
SRC_URI[archive.md5sum] = "29637480e7ce12546668631067c19ced"
SRC_URI[archive.sha256sum] = "07d9766d4aebe05ac572599f8f903a4fe06ab667a8182f2b6cc03e5fb3b80f53"
diff --git a/recipes/xorg-font/font-util_1.1.1.bb b/recipes/xorg-font/font-util_1.1.1.bb
index bb8a0f99f9..3f9b4c8b83 100644
--- a/recipes/xorg-font/font-util_1.1.1.bb
+++ b/recipes/xorg-font/font-util_1.1.1.bb
@@ -4,7 +4,7 @@ PACKAGE_ARCH = "${BASE_PACKAGE_ARCH}"
DESCRIPTION = "X font utils."
-DEPENDS = "encodings util-macros"
+DEPENDS = "util-macros"
RDEPENDS_${PN} = "mkfontdir mkfontscale encodings"
PE = "1"