| Message ID | 397FD63D94A70042B39B21380C6225A829B5E086@ESESSMB305.ericsson.se |
|---|---|
| State | Accepted |
| Headers | show |
On Fri, Apr 22, 2016 at 10:42:43AM +0000, Zoltán Balogh wrote: > From: <Simon Horman> <simon.horman@netronome.com> > > The Debian Policy Manual (https://www.debian.org/doc/debian-policy/ch-controlfields.html#s-f-Version) says that the upstream_version may contain only alphanumerics and the characters . + - : ~ (full stop, plus, hyphen, colon, tilde) and should start with a digit. > > Currently, the upstream_version is defined in the debian/rules file: > > DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]:)*([^-]+).*,\2,p') > > The version number is taken from the dpkg-parsechangelog printout then the first part of the version number which does not contain hyphen is filtered out with sed. However the Debian Policy Manual says that hyphen is allowed in the upstream_version. > > This is not a problem with current vanilla OVS debian version. But, if a postfix string including a hyphen is added to the upstream_version then installation of datapath-dkms package will fail. > > Reported-by: Zoltán Balogh <zoltan.balogh@ericsson.com> > Tested-by: Zoltán Balogh <zoltan.balogh@ericsson.com> Applied, thanks!
diff --git a/debian/rules b/debian/rules index 2a70bd6..7110851 100755 --- a/debian/rules +++ b/debian/rules @@ -13,7 +13,7 @@ PACKAGE=openvswitch PACKAGE_DKMS=openvswitch-datapath-dkms -DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]:)*([^-]+).*,\2,p') +DEB_UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -rne 's,^Version: ([0-9]+:)?([0-9][a-zA-Z0-9.+:~-]*)(-[a-zA-Z0-9*.~]*),\2,p') ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) PARALLEL = -j$(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))