deb: make dh-systemd dependency optional as it's deprecated#212
Conversation
|
Failure on openSUSE is unrelated; not sure why it gets a 404; https://ci-next.docker.com/teams-core/blue/rest/organizations/jenkins/pipelines/containerd-packaging/branches/PR-212/runs/1/nodes/73/log/?start=0 |
|
Interesting; building debian:buster also has the same failure; https://ci-next.docker.com/teams-core/blue/rest/organizations/jenkins/pipelines/containerd-packaging/branches/PR-212/runs/1/nodes/63/log/?start=0 |
|
Windows passed the first time, but failed on the second run (unrelated; looks to be a permissions issue on Jenkins?) |
|
@silvin-lubecki @tianon PTAL |
|
All green now 👍 |
| Build-Depends: libbtrfs-dev | btrfs-tools , | ||
| debhelper, | ||
| dh-systemd, | ||
| debhelper (>= 9.20160709) | dh-systemd, |
There was a problem hiding this comment.
Generally I would suggest ending this in a ~ so that backports will satisfy it (a backport of 9.20160709 would typically have a version number like 9.20160709~bpo90), but in this case I wonder why we're keeping it so low?
Looking at https://packages.debian.org/search?keywords=debhelper and https://packages.ubuntu.com/search?keywords=debhelper, the only version of Debian that still has a version that's "too old" is the EOL Jessie release, and the only version of Ubuntu that's "too old" is Xenial (but backports has a new enough version, which is the route I'd recommend).
So here's what I'd suggest instead:
| debhelper (>= 9.20160709) | dh-systemd, | |
| debhelper (>= 10~), |
(I think this also means you can ditch --with systemd in debian/rules)
There was a problem hiding this comment.
Generally I would suggest ending this in a ~ so that backports will satisfy it (a backport of 9.20160709 would typically have a version number like 9.20160709~bpo90), but in this case I wonder why we're keeping it so low?
Ah, thanks; yes, I mostly copied the recommendation from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958585, but your recommendation definitely looks better
but backports has a new enough version, which is the route I'd recommend
You mean adding the backports repo before running deb build, or would it have that enabled by default?
There was a problem hiding this comment.
I mean it's already enabled by default: 😄
$ docker run --rm ubuntu:xenial grep backports /etc/apt/sources.list
## Also, please note that software in backports WILL NOT receive any review
deb http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse
# deb-src http://archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse9a0e7ff to
2454047
Compare
dh-systemd has been integrated into debhelper, starting with version 9.20160709, and has been removed in Debian 11 "bullseye" This patch updates the control file to not require it as a dependency on current versions of debian that ship with that version of debhelper Related discussions: [1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822670 [2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958585 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2454047 to
99d1295
Compare
|
removed the duplicate |
|
bringing this one in |
equivalent of docker/docker-ce-packaging#520 for containerd packaging
dh-systemd has been integrated into debhelper, starting with version 9.20160709,
and has been removed in Debian 11 "bullseye"
This patch updates the control file to not require it as a dependency
on current versions of debian that ship with that version of debhelper
Related discussions:
[1] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822670
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=958585