diff --git a/deb/common/rules b/deb/common/rules index d9e53a6311..2933c7bf63 100755 --- a/deb/common/rules +++ b/deb/common/rules @@ -2,6 +2,9 @@ VERSION ?= $(shell cat engine/VERSION) TARGET_ARCH = $(shell dpkg-architecture -qDEB_TARGET_ARCH) +# TODO(thaJeztah): allow passing this version when building. +PKG_REVISION ?= 1 +export PKG_REVISION # force packages to be built with xz compression, as Ubuntu 21.10 and up use # zstd compression, which is non-standard, and breaks 'dpkg-sig --verify' @@ -111,11 +114,11 @@ override_dh_install: override_dh_gencontrol: # Use separate version for the buildx-plugin package, then generate the other control files as usual # TODO override "Source" field in control as well (to point to buildx, as it doesn't match the package name) - dh_gencontrol -pdocker-buildx-plugin -- -v$${BUILDX_DEB_VERSION#v}~$${DISTRO}-$${SUITE} + dh_gencontrol -pdocker-buildx-plugin -- -v$${BUILDX_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE} # Use separate version for the compose-plugin package, then generate the other control files as usual # TODO override "Source" field in control as well (to point to compose, as it doesn't match the package name) - dh_gencontrol -pdocker-compose-plugin -- -v$${COMPOSE_DEB_VERSION#v}~$${DISTRO}-$${SUITE} + dh_gencontrol -pdocker-compose-plugin -- -v$${COMPOSE_DEB_VERSION#v}-$${PKG_REVISION}~$${DISTRO}.$${VERSION_ID}-$${SUITE} # Use separate version for the scan-plugin package, then generate the other control files as usual # TODO override "Source" field in control as well (to point to scan-cli-plugin, as it doesn't match the package name)