On Tue, Apr 05, 2016 at 07:56:35AM +0000, Zoltán Balogh wrote: > From: <Simon Horman> <simon.hor...@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. > > Signed-off-by: Simon Horman <simon.hor...@netronome.com> > Reported-by: Zoltán Balogh <zoltan.bal...@ericsson.com> > Tested-by: Zoltán Balogh <zoltan.bal...@ericsson.com> > > --- > > 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)))
This patch is weirdly corrupted. It claims to be changing a hunk that has 7 lines before and after, but there is 1 - line and 3 + lines. "patch" won't apply it. Please resubmit. (If you can't get your mailer to submit it properly, you can submit a github pull request.) _______________________________________________ dev mailing list dev@openvswitch.org http://openvswitch.org/mailman/listinfo/dev
