summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetter Mabäcker <petter@technux.se>2015-01-06 22:26:11 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-01-23 11:35:25 +0000
commitdd7be09318b55a69cb8636e86d2af6e6b8140b31 (patch)
tree267800ef4da7a478aa5bedb61c3f01d3f16bb1b0
parent3693b63c5d33a88591be818a942324954b12e076 (diff)
downloadopenembedded-core-dd7be09318b55a69cb8636e86d2af6e6b8140b31.tar.gz
openembedded-core-dd7be09318b55a69cb8636e86d2af6e6b8140b31.tar.bz2
openembedded-core-dd7be09318b55a69cb8636e86d2af6e6b8140b31.zip
xorg-minimal-fonts: set and handle S in a proper way
After removal of auto-creating S we must ensure that all recipes are using a proper value for S. Also do some minor adjustment after changing value of S. [YOCTO #5627] Signed-off-by: Petter Mabäcker <petter@technux.se>
-rw-r--r--meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb4
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 3688685509..bee500b43a 100644
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -15,13 +15,15 @@ PR = "r2"
inherit allarch
+S = "${WORKDIR}/misc"
+
PACKAGES = "${PN}"
FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
RDEPENDS_${PN} += "font-alias"
do_install() {
install -d ${D}/${datadir}/fonts/X11/misc
- install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/
+ install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
install -d ${D}/${libdir}/X11
ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
}