[LTP] [PATCH 1/3] ci/debian: Simplify dependencies installation / removal

Petr Vorel pvorel@suse.cz
Fri Aug 23 13:42:15 CEST 2024


1) Use asciidoc-base instead of asciidoc for both installation and
   removal (it contains the asciidoc binary, asciidoc is a metapackage,
   thus removing it would not remove the asciidoc binary).

2) asciidoc-base asciidoc-dblatex and ruby-asciidoctor-pdf are available
   on all current not yet EOL versions (from buster (oldoldstable) to
   trixie (testing)), thus it can be safely used without '|| true' fallback.

3) asciidoctor contains the asciidoctor binary and have ruby-asciidoctor
   (ruby asciidoc library) as a dependency. It can be used instead.

4) Remove also ruby-asciidoctor-pdf. It should be removed in flow
   asciidoc => ruby-asciidoctor => ruby-asciidoctor-pdf, but explicit
   remove is more obvious.

5) Don't try to install libc6 (it's an obvious base package, it cannot
   be removed). But it's not working on Ubuntu 18.04 LTS (Bionic Beaver)
   (package not there yet).

This also unifies packages, which is a preparation for a next commit.

Signed-off-by: Petr Vorel <pvorel@suse.cz>
---
 ci/debian.minimal.sh | 5 +++--
 ci/debian.sh         | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/debian.minimal.sh b/ci/debian.minimal.sh
index 0584192721..2ccd161c46 100755
--- a/ci/debian.minimal.sh
+++ b/ci/debian.minimal.sh
@@ -5,7 +5,7 @@
 apt="apt remove -y"
 
 $apt \
-	asciidoc \
+	asciidoc-base \
 	asciidoctor \
 	libacl1-dev \
 	libaio-dev \
@@ -16,4 +16,5 @@ $apt \
 	libsepol-dev \
 	libssl-dev
 
-$apt asciidoc-base ruby-asciidoctor || true
+# Missing on Ubuntu 18.04 LTS (Bionic Beaver)
+$apt ruby-asciidoctor-pdf || true
diff --git a/ci/debian.sh b/ci/debian.sh
index 63cf242d2a..c413ef457b 100755
--- a/ci/debian.sh
+++ b/ci/debian.sh
@@ -15,7 +15,8 @@ apt="apt install -y --no-install-recommends"
 
 $apt \
 	acl-dev \
-	asciidoc \
+	asciidoc-base \
+	asciidoc-dblatex \
 	asciidoctor \
 	autoconf \
 	automake \
@@ -29,7 +30,6 @@ $apt \
 	libacl1-dev \
 	libaio-dev \
 	libcap-dev \
-	libc6 \
 	libc6-dev \
 	libjson-perl \
 	libkeyutils-dev \
@@ -43,7 +43,7 @@ $apt \
 	lsb-release \
 	pkg-config
 
+# Missing on Ubuntu 18.04 LTS (Bionic Beaver)
 $apt ruby-asciidoctor-pdf || true
-$apt asciidoc-dblatex || true
 
 df -hT
-- 
2.45.2



More information about the ltp mailing list