From: Scott Murray <scott.murray@konsulko.com>
Date: Thu, 23 Jan 2020 01:16:24 +0000 (-0500)
Subject: meta-agl-profile-core: update fontconfig bbappend
X-Git-Tag: 9.99.1~106^2~26
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F74%2F23674%2F1;p=AGL%2Fmeta-agl.git

meta-agl-profile-core: update fontconfig bbappend

Update fontconfig bbappend to work with the newer fontconfig 2.13.1
in oe-core in zeus.

Bug-AGL: SPEC-2932

Change-Id: I7dfbe73def6b461915cdfa0131e1a529e1d3a5fd
Signed-off-by: Scott Murray <scott.murray@konsulko.com>
---

diff --git a/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend b/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
index c4bebdc1f..e8ce1ab78 100644
--- a/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
+++ b/meta-agl-profile-core/recipes-test/fontconfig/fontconfig_%.bbappend
@@ -1,16 +1,17 @@
-PACKAGES =+ "fontconfig-test"
-
 do_install_append() {
 	install -m 755 -d ${D}/${datadir}/fontconfig-test
 	install -m 755 ${S}/test/run-test.sh ${D}/${datadir}/fontconfig-test/
 
-	sed -i -e "s/FCLIST=\.\.\/fc\-list\/fc\-list/FCLIST=\/usr\/bin\/fc\-list/g" -e "s/FCCACHE=\.\.\/fc\-cache\/fc\-cache/FCCACHE=\/usr\/bin\/fc\-cache/g" ${D}/${datadir}/fontconfig-test/run-test.sh 
+	sed -i -e "s#^FCLIST=\.\./fc-list/fc-list#FCLIST=/usr/bin/fc-list#g" -e "s#^FCCACHE=\.\./fc-cache/fc-cache#FCCACHE=/usr/bin/fc-cache#g" ${D}/${datadir}/fontconfig-test/run-test.sh 
 
-	for x in 4x6.pcf 8x16.pcf out.expected fonts.conf.in; do
+	install -m 644 ${B}/test/out.expected ${D}/${datadir}/fontconfig-test/
+	for x in 4x6.pcf 8x16.pcf fonts.conf.in; do
 		install -m 644 ${S}/test/$x ${D}/${datadir}/fontconfig-test/
 	done
 }
 
+PACKAGES =+ "fontconfig-test"
+
 DEBIAN_NOAUTONAME_fontconfig-test = "1"
 FILES_fontconfig-test = "${datadir}/fontconfig-test/*"