| Message ID | 20180919125607.16368-1-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [T,X,B,C,U] UBUNTU: Packaging: final-checks: remove trailing backport suffix | expand |
On 09/19/18 14:56, Thadeu Lima de Souza Cascardo wrote: > When we are checking for the existence of ABI files, we will use the previous > changelog stanza version as part of the lookup path. On backport kernels where > we just copy the master kernel ABI, that ABI path will not have the same > version as the backport kernel. We didn't catch this before because we didn't > call the insertchanges rule for backports, which would call final-checks, and > also because we changed the changelog to use the version from the master > kernel. As we plan to change those two factors, we will start seeing check > failures that we shouldn't. > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com> > --- > debian/scripts/misc/final-checks | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks > index 548dea99e6a0..bd204b2bc9e2 100755 > --- a/debian/scripts/misc/final-checks > +++ b/debian/scripts/misc/final-checks > @@ -2,6 +2,7 @@ > > debian="$1" > abi="$2" > +abi=${abi%~*} > > . "$debian/etc/kernelconfig" > >
I've tested the patch and it works as expected.
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
On 09/19/18 14:56, Thadeu Lima de Souza Cascardo wrote: > When we are checking for the existence of ABI files, we will use the previous > changelog stanza version as part of the lookup path. On backport kernels where > we just copy the master kernel ABI, that ABI path will not have the same > version as the backport kernel. We didn't catch this before because we didn't > call the insertchanges rule for backports, which would call final-checks, and > also because we changed the changelog to use the version from the master > kernel. As we plan to change those two factors, we will start seeing check > failures that we shouldn't. > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> > --- > debian/scripts/misc/final-checks | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks > index 548dea99e6a0..bd204b2bc9e2 100755 > --- a/debian/scripts/misc/final-checks > +++ b/debian/scripts/misc/final-checks > @@ -2,6 +2,7 @@ > > debian="$1" > abi="$2" > +abi=${abi%~*} > > . "$debian/etc/kernelconfig" > > Applied to {trusty,xenial/bionic}/master-next branch. Thanks, Kleber
Applied to cosmic master-next and unstable master branches. Thanks. Cascardo. Applied-to: cosmic/master-next Applied-to: unstable/master
diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks index 548dea99e6a0..bd204b2bc9e2 100755 --- a/debian/scripts/misc/final-checks +++ b/debian/scripts/misc/final-checks @@ -2,6 +2,7 @@ debian="$1" abi="$2" +abi=${abi%~*} . "$debian/etc/kernelconfig"
When we are checking for the existence of ABI files, we will use the previous changelog stanza version as part of the lookup path. On backport kernels where we just copy the master kernel ABI, that ABI path will not have the same version as the backport kernel. We didn't catch this before because we didn't call the insertchanges rule for backports, which would call final-checks, and also because we changed the changelog to use the version from the master kernel. As we plan to change those two factors, we will start seeing check failures that we shouldn't. Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- debian/scripts/misc/final-checks | 1 + 1 file changed, 1 insertion(+)