Merge pull request #134 from crazy-max/debhelper-update

deb packaging updates
docker · Aug 4, 2023 · 9a0b91b · 9a0b91b
2 parents 8e34022 + 58f5607
commit 9a0b91b
Show file tree

Hide file tree

Showing 30 changed files with 62 additions and 94 deletions.
diff --git a/pkg/buildx/deb/compat b/pkg/buildx/deb/compat
diff --git a/pkg/buildx/deb/control b/pkg/buildx/deb/control
@@ -7,7 +7,7 @@ Vcs-Browser: https://github.com/docker/buildx
 Vcs-Git: git://github.com/docker/buildx.git
 Standards-Version: 3.9.6
 Build-Depends: bash,
-               debhelper (>= 10~) | dh-systemd
+               debhelper-compat (= 12)
 
 Package: docker-buildx-plugin
 Priority: optional

diff --git a/pkg/buildx/deb/rules b/pkg/buildx/deb/rules
@@ -21,6 +21,12 @@ override_dh_auto_test:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-buildx debian/docker-buildx-plugin/usr/libexec/docker/cli-plugins/docker-buildx
 

diff --git a/pkg/buildx/scripts/pkg-deb-build.sh b/pkg/buildx/scripts/pkg-deb-build.sh
@@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"
 
 set -x
 
-chmod -x debian/compat debian/control debian/docs
+chmod -x debian/control debian/docs
 VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 cp /root/docker-* "${pkgoutput}"/
diff --git a/pkg/compose/deb/compat b/pkg/compose/deb/compat
diff --git a/pkg/compose/deb/control b/pkg/compose/deb/control
@@ -7,7 +7,7 @@ Vcs-Browser: https://github.com/docker/compose
 Vcs-Git: git://github.com/docker/compose.git
 Standards-Version: 3.9.6
 Build-Depends: bash,
-               debhelper (>= 10~) | dh-systemd,
+               debhelper-compat (= 12),
                make
 
 Package: docker-compose-plugin

diff --git a/pkg/compose/deb/rules b/pkg/compose/deb/rules
@@ -16,6 +16,12 @@ override_dh_auto_test:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-compose debian/docker-compose-plugin/usr/libexec/docker/cli-plugins/docker-compose
 

diff --git a/pkg/compose/scripts/pkg-deb-build.sh b/pkg/compose/scripts/pkg-deb-build.sh
@@ -70,6 +70,6 @@ mkdir -p "${pkgoutput}"
 
 set -x
 
-chmod -x debian/compat debian/control debian/docs
+chmod -x debian/control debian/docs
 VERSION=${GENVER_VERSION} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 cp /root/docker-* "${pkgoutput}"/
diff --git a/pkg/containerd/deb/compat b/pkg/containerd/deb/compat
diff --git a/pkg/containerd/deb/control b/pkg/containerd/deb/control
@@ -2,7 +2,7 @@ Source: containerd.io
 Section: devel
 Priority: optional
 Maintainer: Containerd team <help@containerd.io>
-Build-Depends: debhelper (>= 10~) | dh-systemd,
+Build-Depends: debhelper-compat (= 12),
                pkg-config,
                libseccomp-dev
 Standards-Version: 4.1.4

diff --git a/pkg/containerd/deb/rules b/pkg/containerd/deb/rules
@@ -15,7 +15,7 @@
 #   limitations under the License.
 
 %:
-	dh $@ --with systemd
+	dh $@
 
 # GO_SRC_PATH and PKG_NAME are defined in the dockerfile
 # VERSION and REF are defined in scripts/build-deb
@@ -51,6 +51,12 @@ man: ## Create containerd man pages
 override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_build: binaries bin/runc man
 
 override_dh_systemd_start:

diff --git a/pkg/containerd/scripts/pkg-deb-build.sh b/pkg/containerd/scripts/pkg-deb-build.sh
@@ -68,6 +68,6 @@ set -x
 
 sed 's#/usr/local/bin/containerd#/usr/bin/containerd#g' "${SRCDIR}/containerd.service" > /common/containerd.service
 
-chmod -x debian/compat debian/control debian/copyright debian/manpages
+chmod -x debian/control debian/copyright debian/manpages
 VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 cp /root/${PKG_NAME}* "${pkgoutput}"/
diff --git a/pkg/credential-helpers/deb/compat b/pkg/credential-helpers/deb/compat
diff --git a/pkg/credential-helpers/deb/control b/pkg/credential-helpers/deb/control
@@ -6,7 +6,7 @@ Homepage: https://www.docker.com
 Vcs-Browser: https://github.com/docker/docker-credential-helpers
 Vcs-Git: git://github.com/docker/docker-credential-helpers.git
 Standards-Version: 3.9.6
-Build-Depends: debhelper (>= 10~) | dh-systemd,
+Build-Depends: debhelper-compat (= 12),
                gcc,
                libsecret-1-dev,
                make

diff --git a/pkg/credential-helpers/deb/rules b/pkg/credential-helpers/deb/rules
@@ -11,6 +11,12 @@ override_dh_auto_build:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	install -D bin/docker-credential-secretservice debian/docker-credential-secretservice/usr/bin/docker-credential-secretservice
 	install -D bin/docker-credential-pass debian/docker-credential-pass/usr/bin/docker-credential-pass

diff --git a/pkg/credential-helpers/scripts/pkg-deb-build.sh b/pkg/credential-helpers/scripts/pkg-deb-build.sh
@@ -65,7 +65,7 @@ fi
 
 set -x
 
-chmod -x debian/compat debian/control debian/docs
+chmod -x debian/control debian/docs
 VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 mkdir -p "${pkgoutput}"
 cp /root/docker-credential-* "${pkgoutput}"/
diff --git a/pkg/docker-cli/deb/compat b/pkg/docker-cli/deb/compat
diff --git a/pkg/docker-cli/deb/control b/pkg/docker-cli/deb/control
@@ -8,7 +8,7 @@ Vcs-Git: git://github.com/docker/cli.git
 Standards-Version: 3.9.6
 Build-Depends: bash,
                bash-completion,
-               debhelper (>= 10~) | dh-systemd,
+               debhelper-compat (= 12),
                gcc,
                libc-dev,
                make

diff --git a/pkg/docker-cli/deb/rules b/pkg/docker-cli/deb/rules
@@ -19,6 +19,12 @@ override_dh_auto_test:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	install -D -m 0644 cli/contrib/completion/fish/docker.fish debian/docker-ce-cli/usr/share/fish/vendor_completions.d/docker.fish
 	install -D -m 0644 cli/contrib/completion/zsh/_docker debian/docker-ce-cli/usr/share/zsh/vendor-completions/_docker

diff --git a/pkg/docker-cli/scripts/pkg-deb-build.sh b/pkg/docker-cli/scripts/pkg-deb-build.sh
@@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"
 
 set -x
 
-chmod -x debian/compat debian/control debian/docs debian/*.bash-completion debian/*.manpages
+chmod -x debian/control debian/docs debian/*.bash-completion debian/*.manpages
 VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 cp /root/docker-* "${pkgoutput}"/
diff --git a/pkg/docker-engine/deb/compat b/pkg/docker-engine/deb/compat
diff --git a/pkg/docker-engine/deb/control b/pkg/docker-engine/deb/control
@@ -9,7 +9,7 @@ Standards-Version: 3.9.6
 Build-Depends: ca-certificates,
                cmake,
                dh-apparmor,
-               debhelper (>= 10~) | dh-systemd,
+               debhelper-compat (= 12),
                gcc,
                libc-dev,
                libdevmapper-dev,

diff --git a/pkg/docker-engine/deb/docker-ce.docker.upstart b/pkg/docker-engine/deb/docker-ce.docker.upstart
diff --git a/pkg/docker-engine/deb/docker-ce.maintscript b/pkg/docker-engine/deb/docker-ce.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/init/docker.conf 5:24.0.5-1~
diff --git a/pkg/docker-engine/deb/rules b/pkg/docker-engine/deb/rules
@@ -19,6 +19,12 @@ override_dh_auto_test:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	install -D -m 0644 /common/systemd/docker.service debian/docker-ce/lib/systemd/system/docker.service
 	install -D -m 0644 /common/systemd/docker.socket debian/docker-ce/lib/systemd/system/docker.socket
@@ -37,6 +43,10 @@ override_dh_installinit:
 	# use "docker" as our service name, not "docker-ce"
 	dh_installinit --name=docker
 
+override_dh_installsystemd:
+	# use "docker" as our service name, not "docker-ce"
+	dh_installsystemd --name=docker
+
 override_dh_shlibdeps:
 	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
 

diff --git a/pkg/docker-engine/scripts/pkg-deb-build.sh b/pkg/docker-engine/scripts/pkg-deb-build.sh
@@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"
 
 set -x
 
-chmod -x debian/compat debian/control debian/docs
+chmod -x debian/control debian/docs
 VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT_SHORT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 cp /root/docker-* "${pkgoutput}"/
diff --git a/pkg/sbom/deb/compat b/pkg/sbom/deb/compat
diff --git a/pkg/sbom/deb/control b/pkg/sbom/deb/control
@@ -7,7 +7,7 @@ Vcs-Browser: https://github.com/docker/sbom-cli-plugin
 Vcs-Git: git://github.com/docker/sbom-cli-plugin.git
 Standards-Version: 3.9.6
 Build-Depends: bash,
-               debhelper (>= 10~) | dh-systemd,
+               debhelper-compat (= 12),
                make
 
 Package: docker-sbom-plugin

diff --git a/pkg/sbom/deb/rules b/pkg/sbom/deb/rules
@@ -19,6 +19,12 @@ override_dh_auto_test:
 override_dh_strip:
 	# Go has lots of problems with stripping, so just don't
 
+# http://manpages.debian.org/dh_dwz
+override_dh_dwz:
+	# dh_dwz in debhelper versions less than 13 has issues with files that are missing debug symbols (once we update to debhelper-compat 13+ this can be removed)
+	@# https://packages.debian.org/debhelper
+	@# https://packages.ubuntu.com/debhelper
+
 override_dh_auto_install:
 	install -D -m 0755 /usr/libexec/docker/cli-plugins/docker-sbom debian/docker-sbom-plugin/usr/libexec/docker/cli-plugins/docker-sbom
 

diff --git a/pkg/sbom/scripts/pkg-deb-build.sh b/pkg/sbom/scripts/pkg-deb-build.sh
@@ -66,6 +66,6 @@ mkdir -p "${pkgoutput}"
 
 set -x
 
-chmod -x debian/compat debian/control debian/docs
+chmod -x debian/control debian/docs
 VERSION=${GENVER_VERSION} REVISION=${GENVER_COMMIT} dpkg-buildpackage $PKG_DEB_BUILDFLAGS --host-arch $(xx-info debian-arch) --target-arch $(xx-info debian-arch)
 cp /root/docker-* "${pkgoutput}"/