diff options
| author | d1r3ct0r <calvin.mwadime@canonical.com> | 2023-01-16 22:26:02 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-16 12:26:02 -0700 |
| commit | 07f154be45fee13c542251807a016d9592c59f9e (patch) | |
| tree | 1dcb00e6295d29d3eb19a3a91da0c7aee143a653 /packages | |
| parent | 71ddb9677212dcc76a9831fb19508ae4bc86988c (diff) | |
| download | cloud-init-git-07f154be45fee13c542251807a016d9592c59f9e.tar.gz | |
bddeb: drop dh-systemd dependency on newer deb-based releases
Fix `make deb` and `make ubuntu-ci-deps` targets on Jammy and newer.
Update packages/bddeb to only append dh-systemd as a
dependency on older Debian and Ubuntu stable series.
Diffstat (limited to 'packages')
| -rwxr-xr-x | packages/bddeb | 6 | ||||
| -rw-r--r-- | packages/pkg-deps.json | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/packages/bddeb b/packages/bddeb index fdb541d4..44d82a78 100755 --- a/packages/bddeb +++ b/packages/bddeb @@ -100,8 +100,10 @@ def write_debian_folder(root, templ_data, cloud_util_deps): requires.extend(['python3'] + reqs + test_reqs) if templ_data['debian_release'] == 'xenial': requires.append('python3-pytest-catchlog') - elif templ_data['debian_release'] == 'impish': - requires.remove('dh-systemd') + elif templ_data['debian_release'] in ( + 'buster', 'xenial', 'bionic', 'focal' + ): + requires.append('dh-systemd') templater.render_to_file(util.abs_join(find_root(), 'packages', 'debian', 'control.in'), util.abs_join(deb_dir, 'control'), diff --git a/packages/pkg-deps.json b/packages/pkg-deps.json index 8ba27e85..64c299a4 100644 --- a/packages/pkg-deps.json +++ b/packages/pkg-deps.json @@ -3,7 +3,6 @@ "build-requires" : [ "debhelper", "dh-python", - "dh-systemd", "python3-debconf" ], "renames" : { |