pkg(sbom): update debhelper compat to 12 and set override_dh_dwz

Signed-off-by: CrazyMax <[email protected]>
docker · Aug 4, 2023 · 58f5607 · 58f5607
1 parent 712e381
commit 58f5607
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
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}"/