mirror of
https://github.com/raspberrypi/linux.git
synced 2025-12-06 01:49:46 +00:00
Merge remote-tracking branch 'stable/linux-5.10.y' into rpi-5.10.y
This commit is contained in:
@@ -59,12 +59,8 @@ Otherwise DTx is treated as a dts source file (aka .dts).
|
||||
or '/include/' to be processed.
|
||||
|
||||
If DTx_1 and DTx_2 are in different architectures, then this script
|
||||
may not work since \${ARCH} is part of the include path. Two possible
|
||||
workarounds:
|
||||
|
||||
`basename $0` \\
|
||||
<(ARCH=arch_of_dtx_1 `basename $0` DTx_1) \\
|
||||
<(ARCH=arch_of_dtx_2 `basename $0` DTx_2)
|
||||
may not work since \${ARCH} is part of the include path. The following
|
||||
workaround can be used:
|
||||
|
||||
`basename $0` ARCH=arch_of_dtx_1 DTx_1 >tmp_dtx_1.dts
|
||||
`basename $0` ARCH=arch_of_dtx_2 DTx_2 >tmp_dtx_2.dts
|
||||
|
||||
@@ -76,6 +76,7 @@ my %texlive = (
|
||||
'ucs.sty' => 'texlive-ucs',
|
||||
'upquote.sty' => 'texlive-upquote',
|
||||
'wrapfig.sty' => 'texlive-wrapfig',
|
||||
'ctexhook.sty' => 'texlive-ctex',
|
||||
);
|
||||
|
||||
#
|
||||
@@ -370,6 +371,9 @@ sub give_debian_hints()
|
||||
);
|
||||
|
||||
if ($pdf) {
|
||||
check_missing_file(["/usr/share/texlive/texmf-dist/tex/latex/ctex/ctexhook.sty"],
|
||||
"texlive-lang-chinese", 2);
|
||||
|
||||
check_missing_file(["/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf"],
|
||||
"fonts-dejavu", 2);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user