From 38419263f6033f1ac086f27d80136eb030c9cb4f Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 6 Oct 2016 20:06:28 +0200 Subject: add liberation truetype font package and add mkfontscale check, complete the other font checks --- mk/image.mk | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'mk/image.mk') diff --git a/mk/image.mk b/mk/image.mk index a3e044fde..f2f00e650 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -61,11 +61,14 @@ image-prepare-post: rng=/dev/arandom; test -e $$rng || rng=/dev/urandom; \ dd if=$$rng bs=512 count=1 >>${TARGET_DIR}/etc/.rnd 2>/dev/null; \ chmod 600 ${TARGET_DIR}/etc/.rnd - @-if [ -d ${TARGET_DIR}/usr/share/fonts/X11 ];then \ - for i in $$(ls ${TARGET_DIR}/usr/share/fonts/X11/);do \ - mkfontdir ${TARGET_DIR}/usr/share/fonts/X11/$${i}; \ - done; \ - fi + -for dir in X11 truetype; do \ + if [ -d ${TARGET_DIR}/usr/share/fonts/$${dir} ];then \ + for i in $$(ls ${TARGET_DIR}/usr/share/fonts/$${dir}/);do \ + mkfontdir ${TARGET_DIR}/usr/share/fonts/$${dir}/$${i}; \ + mkfontscale ${TARGET_DIR}/usr/share/fonts/$${dir}/$${i}; \ + done; \ + fi; \ + done $(SED) '/^root:/s!:/bin/sh$$!:${ROOTSH}!' ${TARGET_DIR}/etc/passwd -rm -f ${TARGET_DIR}/bin/sh ln -sf ${BINSH} ${TARGET_DIR}/bin/sh -- cgit v1.2.3