diff options
author | Mauro Carvalho Chehab <mchehab+huawei@kernel.org> | 2020-04-14 18:56:09 +0200 |
---|---|---|
committer | Jonathan Corbet <corbet@lwn.net> | 2020-04-20 15:19:12 -0600 |
commit | b3df6223bdea763ed666b06a4e7431f40b33da67 (patch) | |
tree | ed27b858ff79e2eb72da84c8070c8d45938b3e46 /scripts/sphinx-pre-install | |
parent | d14d0c1aea8fe0eb61b7788a3b546475e183b079 (diff) | |
download | linux-stable-b3df6223bdea763ed666b06a4e7431f40b33da67.tar.gz linux-stable-b3df6223bdea763ed666b06a4e7431f40b33da67.tar.bz2 linux-stable-b3df6223bdea763ed666b06a4e7431f40b33da67.zip |
scripts: sphinx-pre-install: improve openSuse Tumbleweed check
Currently, with openSUSE Tumbleweed 20200303, it keeps
recommending this forever:
sudo zypper install --no-recommends rsvg-view
This dependency will never be fulfilled there, as the package
now is named as on other distros: rsvg-convert.
So, improve the detection to avoid such issue.
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Link: https://lore.kernel.org/r/c3774f72ac36c5e5b5f446ae5db5b795d1f274f4.1586883286.git.mchehab+huawei@kernel.org
Signed-off-by: Jonathan Corbet <corbet@lwn.net>
Diffstat (limited to 'scripts/sphinx-pre-install')
-rwxr-xr-x | scripts/sphinx-pre-install | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install index ea941c6e0647..6d6d2849fbb1 100755 --- a/scripts/sphinx-pre-install +++ b/scripts/sphinx-pre-install @@ -446,9 +446,11 @@ sub give_opensuse_hints() "convert" => "ImageMagick", "Pod::Usage" => "perl-Pod-Usage", "xelatex" => "texlive-xetex-bin", - "rsvg-convert" => "rsvg-view", ); + # On Tumbleweed, this package is also named rsvg-convert + $map{"rsvg-convert"} = "rsvg-view" if (!($system_release =~ /Tumbleweed/)); + my @suse_tex_pkgs = ( "texlive-babel-english", "texlive-caption", |