Browse Source

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

(From OE-Core rev: a8c8731caca14bb7a71e6468877857e0e85f4ce7)

Signed-off-by: Markus Volk <f_l_k@t-online.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Markus Volk 3 tháng trước cách đây
mục cha
commit
d1f0bbb962
1 tập tin đã thay đổi với 3 bổ sung1 xóa
  1. 3 1
      meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb

+ 3 - 1
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