[artful/master-next 3/3] UBUNTU: [Packaging] final-checks -- check for empty retpoline files

[Seth Forshee]

On Thu, Feb 22, 2018 at 10:05:14PM +0000, Andy Whitcroft wrote:
> On Thu, Feb 22, 2018 at 02:52:49PM -0600, Seth Forshee wrote:
> > On Thu, Feb 22, 2018 at 11:53:40AM +0000, Andy Whitcroft wrote:
> > > BugLink: http://bugs.launchpad.net/bugs/1751021
> > > Signed-off-by: Andy Whitcroft <apw at canonical.com>
> > > ---
> > >  debian/scripts/misc/final-checks | 5 +++++
> > >  1 file changed, 5 insertions(+)
> > > 
> > > diff --git a/debian/scripts/misc/final-checks b/debian/scripts/misc/final-checks
> > > index 548dea99e6a0..aec25770ea1b 100755
> > > --- a/debian/scripts/misc/final-checks
> > > +++ b/debian/scripts/misc/final-checks
> > > @@ -41,6 +41,11 @@ abi_check()
> > >  	then
> > >  		failure "$arch/$flavour ABI retpoline file missing"
> > >  	fi
> > > +
> > > +	if [ -f "$abidir/$flavour.retpoline" -a \
> > > +	     ! -s "$abidir/$flavour.retpoline" ]; then
> > > +		failure "$arch/$flavour ABI retpoline file empty -- must regenerate or ignore"
> > > +	fi
> > >  }
> > 
> > On second thought, shouldn't this check also be skipped if there's a
> > retpoline.ignore file? Otherwise how are we to get past this check for
> > the uploads where we do have empty retpoline files in the abi for i386?
> 
> You would add the ignore and remove the empty file I guess.  But the
> other option is indeed to take ignore into account.

Yeah I suppose that will work.