Fixes for groff and toolchain-scripts.bbclass
cover Fixes for groff and toolchain-scripts.bbclass
From: Kai Kang <[email protected]>
The following changes since commit 3be5331986289bf11040c241fd54239fb2011695:
testimage.bbclass: define ptest suite variable (2018-10-25 14:53:44 +0100)
are available in the Git repository at:
git://git.pokylinux.org/poky-contrib kangkai/misc
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kangkai/misc
Kai Kang (2):
groff: not search fonts on build host toolchain-scripts.bbclass: fix paths of siteconfig files
meta/classes/toolchain-scripts.bbclass | 9 +++++---- ...groff-not-search-fonts-on-build-host.patch | 20 +++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 1 + 3 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
Signature · 1 line
2.18.0
PATCH 1/2 groff: not search fonts on build host
From: Kai Kang <[email protected]>
groff searches fonts on build host which are provided by ghostscript. The number of font files installed by groff are different according to whether ghostscript fonts are installed on build host. Fix it by not search font dirs on the host.
--- ...groff-not-search-fonts-on-build-host.patch | 20 +++++++++++++++++++ meta/recipes-extended/groff/groff_1.22.3.bb | 1 + 2 files changed, 21 insertions(+) create mode 100644 meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch
meta/recipes-extended/groff/groff-1.22.3/groff-not-search-fonts-on-build-host.patch new file +20 -0
@@ -0,0 +1,20 @@ +groff searchs fonts which are provided by ghostscript on build host. +It causes non-determinism issue. So not search font dirs on host. + +Upstream-Status: Inappropriate [cross build specific] + +Signed-off-by: Kai Kang <[email protected]> + +diff --git a/font/devpdf/Foundry.in b/font/devpdf/Foundry.in +index a6e968f..8094642 100644 +--- a/font/devpdf/Foundry.in ++++ b/font/devpdf/Foundry.in +@@ -65,7 +65,7 @@ ZD|Y||||Dingbats!d050000l.pfb + #====================================================================== + + #Foundry|Name|Searchpath +-foundry|U|(gs):/usr/share/fonts/type1/gsfonts :/opt/local/share/fonts/urw-fonts # the URW fonts delivered with ghostscript (may be different) ++foundry|U|(gs) # the URW fonts delivered with ghostscript (may be different) + #Define Flags for afmtodit + + r=-i 0 -m
meta/recipes-extended/groff/groff_1.22.3.bb +1 -0
@@ -11,6 +11,7 @@ SRC_URI = "${GNU_MIRROR}/groff/groff-${PV}.tar.gz \ file://groff-1.22.2-correct-man.local-install-path.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0001-replace-perl-w-with-use-warnings.patch \ + file://groff-not-search-fonts-on-build-host.patch \ " SRC_URI[md5sum] = "cc825fa64bc7306a885f2fb2268d3ec5"
Signature · 1 line
2.18.0
PATCH 2/2 toolchain-scripts.bbclass: fix paths of siteconfig files
In reply to [email protected]From: Kai Kang <[email protected]>
It can't find right siteconfig files in toolchain-scripts.bbclass after adapting to RSS. Correct the paths.
--- meta/classes/toolchain-scripts.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
meta/classes/toolchain-scripts.bbclass +5 -4
@@ -158,7 +158,7 @@ EOF #we get the cached site config in the runtime TOOLCHAIN_CONFIGSITE_NOCACHE = "${@siteinfo_get_files(d)}" -TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${STAGING_DIR}/${MLPREFIX}${MACHINE}/${target_datadir}/${TARGET_SYS}_config_site.d" +TOOLCHAIN_CONFIGSITE_SYSROOTCACHE = "${COMPONENTS_DIR}/${DEFAULTTUNE}" TOOLCHAIN_NEED_CONFIGSITE_CACHE ??= "virtual/${MLPREFIX}libc ncurses" DEPENDS += "${TOOLCHAIN_NEED_CONFIGSITE_CACHE}"
@@ -178,11 +178,12 @@ toolchain_create_sdk_siteconfig () { # Resolve virtual/* names to the real recipe name using sysroot-providers info case $sitefile in virtual/*) sitefile=`echo $sitefile | tr / _` - sitefile=`cat ${STAGING_DIR_TARGET}/sysroot-providers/$sitefile` + sitefile=`cat ${STAGING_DIR_TARGET}/sysroot-providers/$sitefile | sed "s/^${MLPREFIX}//"` esac - if [ -r ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config ]; then - cat ${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${sitefile}_config >> $siteconfig + sitefile_config=${TOOLCHAIN_CONFIGSITE_SYSROOTCACHE}/${MLPREFIX}${sitefile}/${target_datadir}/${TARGET_SYS}_config_site.d/${sitefile}_config + if [ -r $sitefile_config ]; then + cat $sitefile_config >> $siteconfig fi done }
Signature · 1 line
2.18.0