From: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
To: Linux Doc Mailing List <linux-doc@vger.kernel.org>
Cc: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>,
linux-kernel@vger.kernel.org, Jonathan Corbet <corbet@lwn.net>,
Tim Bird <Tim.Bird@sony.com>,
Markus Heiser <markus.heiser@darmarit.de>
Subject: [PATCH 2/6] scripts: sphinx-pre-install: improve openSuse Tumbleweed check
Date: Wed, 8 Apr 2020 17:55:21 +0200 [thread overview]
Message-ID: <6bfb24f9203205cef02d3dee3fda48a062a1dfa6.1586361086.git.mchehab+huawei@kernel.org> (raw)
In-Reply-To: <cover.1586361086.git.mchehab+huawei@kernel.org>
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>
---
scripts/sphinx-pre-install | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/scripts/sphinx-pre-install b/scripts/sphinx-pre-install
index c2071a1c69ea..46c58a5795f1 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",
--
2.25.2
next prev parent reply other threads:[~2020-04-08 15:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-08 15:55 [PATCH 0/6] sphinx-pre-install improvements for Kernel 5.8 Mauro Carvalho Chehab
2020-04-08 15:55 ` [PATCH 1/6] scripts: sphinx-pre-install: improve distro detection check Mauro Carvalho Chehab
2020-04-08 17:01 ` Bird, Tim
2020-04-08 15:55 ` Mauro Carvalho Chehab [this message]
2020-04-08 15:55 ` [PATCH 3/6] scripts: sphinx-pre-install: fix a dependency hint with Ubuntu 16.04 Mauro Carvalho Chehab
2020-04-08 15:55 ` [PATCH 4/6] scripts: sphinx-pre-install: address some issues with Gentoo Mauro Carvalho Chehab
2020-04-08 15:55 ` [PATCH 5/6] scripts: sphinx-pre-install: add support for OpenMandriva Mauro Carvalho Chehab
2020-04-08 15:55 ` [PATCH 6/6] scripts: sphinx-pre-install: add support for python -m venv Mauro Carvalho Chehab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=6bfb24f9203205cef02d3dee3fda48a062a1dfa6.1586361086.git.mchehab+huawei@kernel.org \
--to=mchehab+huawei@kernel.org \
--cc=Tim.Bird@sony.com \
--cc=corbet@lwn.net \
--cc=linux-doc@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=markus.heiser@darmarit.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).