summaryrefslogtreecommitdiffstats
path: root/meta
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:36:27 +0000
commit00fbca6950505446748580fe58bd64ab673d5cc9 (patch)
treeee08ab75dda8c676ecd9cdd6b755181b4ffcc6d9 /meta
parent06a2dd73eaf4afaf1c28b8e24204cb85f5da0a1f (diff)
downloadpoky-00fbca6950505446748580fe58bd64ab673d5cc9.tar.gz
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] (From OE-Core rev: dd7be09318b55a69cb8636e86d2af6e6b8140b31) Signed-off-by: Petter Mabäcker <petter@technux.se> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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"
15 15
16inherit allarch 16inherit allarch
17 17
18S = "${WORKDIR}/misc"
19
18PACKAGES = "${PN}" 20PACKAGES = "${PN}"
19FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" 21FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/"
20RDEPENDS_${PN} += "font-alias" 22RDEPENDS_${PN} += "font-alias"
21 23
22do_install() { 24do_install() {
23 install -d ${D}/${datadir}/fonts/X11/misc 25 install -d ${D}/${datadir}/fonts/X11/misc
24 install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/ 26 install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
25 install -d ${D}/${libdir}/X11 27 install -d ${D}/${libdir}/X11
26 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s 28 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s
27} 29}