[PATCH 1/3][X] UBUNTU: [Config] add arm64 to annotations arch list

[Seth Forshee]

On Wed, Mar 17, 2021 at 09:22:16AM +0100, Stefan Bader wrote:
> On 16.03.21 13:13, Seth Forshee wrote:
> > On Tue, Mar 16, 2021 at 07:20:17AM +0100, Stefan Bader wrote:
> > > On 15.03.21 22:44, Seth Forshee wrote:
> > > > Properties: no-test-build
> > > > Ignore: yes
> > > > Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> > > > ---
> > > >    debian.master/config/annotations | 2 +-
> > > >    1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > diff --git a/debian.master/config/annotations b/debian.master/config/annotations
> > > > index 68f4c169f538..c798030ca326 100644
> > > > --- a/debian.master/config/annotations
> > > > +++ b/debian.master/config/annotations
> > > > @@ -1,6 +1,6 @@
> > > >    # Menu: HEADER
> > > >    # FORMAT: 2
> > > > -# ARCH: x86 arm powerpc s390
> > > > +# ARCH: x86 arm arm64 powerpc s390
> > > 
> > > arm is not an arch. I suspect someone tried to use arm as matchall for
> > > armhf and arm64. If that does not work for arm64, then we should replace arm
> > > with "armhf arm64".
> > 
> > They are kernel architectures, not the Ubuntu ones. Otherwise we'd have
> > amd64 and s390x instead of x86 and s390. So arm is correct.
> > 
> > Seth
> > 
> Hm, ok, then sorry for the noise. Still its confusing. There are sometimes
> annotations split up by <arch>-<flavour> and I could swear those were Debian
> arches...

They are just about two different things. The ARCH header is about which
arch directories to look at for config opttions, whereas the annotations
are about our arch-flavour configs. Would be less confusing I guess if
the ARCH header had Ubuntu arches and the tools converted them to the
kernel arch, but that's not how the tools were written.