From 602a4169d548c0eccb6612f8347d501bfea5c176 Mon Sep 17 00:00:00 2001 From: Matheus Machado Guilhermino Date: Mon, 7 Mar 2022 17:38:33 -0300 Subject: [PATCH] Address unmet dependencies in puppet-rabbitmq-8.5.0 The following dependencies were generating "unresolved dependency" warnings during bootstrap on Debian: puppet-archive (>= 2.0.0 < 4.0.0) camptocamp-systemd (>= 2.1.0 < 3.0.0) But they are not present in Debian Bullseye and not installable using the base-bullseye.lst. Also, puppet-archive is not needed since rabbitmq is not configured to install pkgs at runtime, and camptocamp-systemd only manages the file limit before bootstrap (sets to 524288) and removing it does not present big risks. The solution was to create a patch to remove the dependency declaration for each module. Debian Bullseye tests: PASS: Build & install PASS: Successful Bootstrap Story: 2009101 Task: 44710 Signed-off-by: Matheus Machado Guilhermino Change-Id: Ia6025c56dca3ee7f34058057bdd64a6232d30988 --- ...004-Remove-incompatible-dependencies.patch | 34 +++++++++++++++++++ .../debian/patches/series | 1 + 2 files changed, 35 insertions(+) create mode 100644 config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/0004-Remove-incompatible-dependencies.patch diff --git a/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/0004-Remove-incompatible-dependencies.patch b/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/0004-Remove-incompatible-dependencies.patch new file mode 100644 index 000000000..fde1fecb4 --- /dev/null +++ b/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/0004-Remove-incompatible-dependencies.patch @@ -0,0 +1,34 @@ +From b3dc2a215a2183583a723e4bffdec2f9632c93eb Mon Sep 17 00:00:00 2001 +From: Matheus Machado Guilhermino +Date: Mon, 21 Mar 2022 11:01:47 +0000 +Subject: [PATCH] Remove incompatible dependencies + +Removed puppet-archive and camptocamp-systemd. + +Signed-off-by: Matheus Machado Guilhermino +--- + metadata.json | 8 -------- + 1 file changed, 8 deletions(-) + +diff --git a/metadata.json b/metadata.json +index 039eba2..bfec5bd 100644 +--- a/metadata.json ++++ b/metadata.json +@@ -63,14 +63,6 @@ + { + "name": "puppetlabs/stdlib", + "version_requirement": ">= 4.13.1 < 6.0.0" +- }, +- { +- "name": "puppet/archive", +- "version_requirement": ">= 2.0.0 < 4.0.0" +- }, +- { +- "name": "camptocamp/systemd", +- "version_requirement": ">= 2.1.0 < 3.0.0" + } + ], + "tags": [ +-- +2.30.2 + diff --git a/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/series b/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/series index c8510fcd2..41aec6743 100644 --- a/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/series +++ b/config/puppet-modules/puppet-rabbitmq-8.5.0/debian/patches/series @@ -1,3 +1,4 @@ 0001-Adapt-first-legacy-patches.patch 0002-Changed-cipher-specification-to-open.patch 0003-Remove-the-rabbitmq_nodename-fact.patch +0004-Remove-incompatible-dependencies.patch