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>

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
 }