On Sun, Oct 05, 2025 at 11:10:12PM +0100, Adriano Carvalho wrote: > As it is right now, kfigure relies on ImageMagick's convert. It, > however, fails to convert some SVG files (see below). With this change, > inkscape support is added. If present, inkscape is preferred over > ImageMagick's convert. > > With this change kfigure.py is an exact copy of the Linux kernel's at > v6.17. I reviewed all the changes and, it seems to me that, only one > change may cause trouble: logging uses a slightly different approach > (logger v. kernellog). > > inkscape is also added as a dependency. Dockerfile updated as well. > > Without this change, this is what I get with > docker.io/trini/u-boot-gitlab-ci-runner:jammy-20250714-25Jul2025: > > [...] > convert: unrecognized color `context-stroke' @ > warning/color.c/GetColorCompliance/1057. > convert: non-conforming drawing primitive definition `stroke' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/develop/pics/spl_before_reloc.svg > /home/uboot/u-boot/doc/output/latex/spl_before_reloc.pdf > convert: unrecognized color `context-stroke' @ > warning/color.c/GetColorCompliance/1057. > convert: non-conforming drawing primitive definition `stroke' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/develop/pics/spl_after_reloc.svg > /home/uboot/u-boot/doc/output/latex/spl_after_reloc.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/ospi_sysfw2.svg > /home/uboot/u-boot/doc/output/latex/ospi_sysfw2.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/ospi_sysfw-am64.svg > /home/uboot/u-boot/doc/output/latex/ospi_sysfw-am64.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/emmc_am65x_evm_boot0.svg > /home/uboot/u-boot/doc/output/latex/emmc_am65x_evm_boot0.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/ospi_sysfw.svg > /home/uboot/u-boot/doc/output/latex/ospi_sysfw.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/emmc_j7200_evm_boot01.svg > /home/uboot/u-boot/doc/output/latex/emmc_j7200_evm_boot01.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/emmc_j7200_evm_udafs.svg > /home/uboot/u-boot/doc/output/latex/emmc_j7200_evm_udafs.pdf > convert: non-conforming drawing primitive definition `Liberation' @ > error/draw.c/RenderMVGContent/4414. > WARNING: Error #1 when calling: /usr/bin/convert > /home/uboot/u-boot/doc/board/ti/img/ospi_sysfw3.svg > /home/uboot/u-boot/doc/output/latex/ospi_sysfw3.pdf > [...] > build finished with problems, 9 warnings (with warnings treated as errors). > make[1]: *** [doc/Makefile:84: latexdocs] Error 1 > make: *** [Makefile:2687: pdfdocs] Error 2 > > To get the above the following line in /etc/ImageMagick-6/policy.xml > needs to be deleted or commented out: > > <policy domain="coder" rights="none" pattern="PDF" /> > > Otherwise, we'll get: > > convert: attempt to perform an operation not allowed by the security policy > `PDF' @ error/constitute.c/IsCoderAuthorized/426. > > inkscape has the added advantage of this not being necessary. > > NOTE: This won't completely fix the pdfdocs target. See next commit(s). > > Signed-off-by: Adriano Carvalho <[email protected]>
Reviewed-by: Tom Rini <[email protected]> -- Tom
signature.asc
Description: PGP signature
