scripts/sphinx-pre-install: get rid of RHEL7 explicity check (c4c562de) · Commits · 戴 / test

RHEL8 was already launched. This test won't get it, and will do the wrong thing. Ok, we could fix it, but now we check Sphinx version to ensure that it matches the minimal (1.3), so there's no need for an explicit check there. Signed-off-by:

Mauro Carvalho Chehab <mchehab+samsung@kernel.org> Signed-off-by:

Jonathan Corbet <corbet@lwn.net>

scripts/sphinx-pre-install

+0 −13

Original line number	Diff line number	Diff line
		@@ -581,19 +581,6 @@ sub check_needs()
		print "Unknown OS\n";
		}

		# RHEL 7.x and clones have Sphinx version 1.1.x and incomplete texlive
		if (($system_release =~ /Red Hat Enterprise Linux/) \|\|
		($system_release =~ /CentOS/) \|\|
		($system_release =~ /Scientific Linux/) \|\|
		($system_release =~ /Oracle Linux Server/)) {
		$virtualenv = 1;
		$pdf = 0;

		printf("NOTE: On this distro, Sphinx and TexLive shipped versions are incompatible\n");
		printf("with doc build. So, use Sphinx via a Python virtual environment.\n\n");
		printf("This script can't install a TexLive version that would provide PDF.\n");
		}

		# Check for needed programs/tools
		check_sphinx();
		check_perl_module("Pod::Usage", 0);

Admin message