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>

diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index 36886855091d0b4f593ad9203e066ad363ee666d..bee500b43a567131d582a85f9c684dc0eb80ce12 100644 (file)
--- 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
 }