xorg-minimal-fonts: dont try to install builddir

With current master branch I see an error in do_install:
| DEBUG: Executing shell function do_install
| install: omitting directory '/home/flk/poky/build/tmp/work/all-poky-linux/xorg-minimal-fonts/1.0/misc/xorg-minimal-fonts-1.0-build'
| WARNING: /home/flk/poky/build/tmp/work/all-poky-linux/xorg-minimal-fonts/1.0/temp/run.do_install.112196:151 exit 1 from 'install -m 0644 /home/flk/poky/build/tmp/work/all-poky-linux/xorg-minimal-fonts/1.0/misc/* /home/flk/poky/build/tmp/work/all-poky-linux/xorg-minimal-fonts/1.0/image//usr/share/fonts/X11/misc/'
| WARNING: Backtrace (BB generated script):
| 	#1: do_install, /home/flk/poky/build/tmp/work/all-poky-linux/xorg-minimal-fonts/1.0/temp/run.do_install.112196, line 151
| 	#2: main, /home/flk/poky/build/tmp/work/all-poky-linux/xorg-minimal-fonts/1.0/temp/run.do_install.112196, line 159
ERROR: Task (/home/flk/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb:do_install) failed with exit code '1'

Fix the problem by specifying more precisely what is to be installed

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
index d32ef774472b311ed39c55dbb9aeabebc1750289..e51e3fbc3ada8e18475d050cfa9bf1f70a3cf08b 100644 (file)
--- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
+++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb
@@ -27,7 +27,9 @@ RDEPENDS:${PN} += "font-alias"
 
 do_install() {
        install -d ${D}/${datadir}/fonts/X11/misc
-       install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/
+       for file in ${S}/*.gz ${S}/fonts.dir; do
+               install -m 0644 "$file" ${D}/${datadir}/fonts/X11/misc/
+       done
        # Pick a date/time as otherwise it would be the git checkout/modify time
        touch -d @1613559011 ${D}/${datadir}/fonts/X11/misc/*
        install -d ${D}/${libdir}/X11