[PATCH 1/2][SRU][E] UBUNTU: [Packaging] Remove x32 arch references from control files

[Tyler Hicks]

On 2019-09-30 10:34:35, Seth Forshee wrote:
> On Mon, Sep 30, 2019 at 10:20:35AM -0500, Tyler Hicks wrote:
> > On 2019-09-30 09:47:44, Seth Forshee wrote:
> > > BugLink: https://bugs.launchpad.net/bugs/1845714
> > > 
> > > These were added for an arch bringup which never happened. Remove
> > > them to facilitate generating a list of supported architectures
> > > from the control file.
> > > 
> > > Signed-off-by: Seth Forshee <seth.forshee at canonical.com>
> > 
> > Does this mean that we can disable CONFIG_X86_X32 in our amd64 kernel
> > configs?
> 
> Whether we want to support x32 binaries in our kernel is a separate
> discussion. All that is about is the fact that we don't have x32 as a
> supported architecture in Ubuntu but do list it in the control file.
> Since I'd like to be able to determine from the control file what
> architectures are supported, having x32 in there is problematic.

That makes sense. Thanks.

Tyler

> 
> Seth
> 
> > 
> > Tyler
> > 
> > > ---
> > >  debian.master/control.d/vars.generic    | 4 ++--
> > >  debian.master/control.d/vars.lowlatency | 4 ++--
> > >  debian.master/control.stub.in           | 2 +-
> > >  3 files changed, 5 insertions(+), 5 deletions(-)
> > > 
> > > diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
> > > index 139a9f3135c8..cd3698688d2d 100644
> > > --- a/debian.master/control.d/vars.generic
> > > +++ b/debian.master/control.d/vars.generic
> > > @@ -2,5 +2,5 @@ arch="amd64 armhf arm64 ppc64el s390x"
> > >  supported="Generic"
> > >  target="Geared toward desktop and server systems."
> > >  desc="=HUMAN= SMP"
> > > -bootloader="grub-pc [amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [amd64 x32] | grub [amd64 x32] | lilo [amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
> > > -provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64 x32]"
> > > +bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
> > > +provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
> > > diff --git a/debian.master/control.d/vars.lowlatency b/debian.master/control.d/vars.lowlatency
> > > index 08a98dbd0fc5..6cef9f8ee0f1 100644
> > > --- a/debian.master/control.d/vars.lowlatency
> > > +++ b/debian.master/control.d/vars.lowlatency
> > > @@ -2,5 +2,5 @@ arch="amd64"
> > >  supported="Lowlatency"
> > >  target="Geared toward desktop and server systems."
> > >  desc="=HUMAN= SMP"
> > > -bootloader="grub-pc [amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [amd64 x32] | grub [amd64 x32] | lilo [amd64 x32] | flash-kernel [armhf arm64]"
> > > -provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64 x32]"
> > > +bootloader="grub-pc [amd64] | grub-efi-amd64 [amd64] | grub-efi-ia32 [amd64] | grub [amd64] | lilo [amd64] | flash-kernel [armhf arm64]"
> > > +provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [amd64]"
> > > diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
> > > index 1cece7c17e84..c19ede1d451c 100644
> > > --- a/debian.master/control.stub.in
> > > +++ b/debian.master/control.stub.in
> > > @@ -104,7 +104,7 @@ Description: Header files related to Linux kernel version PKGVER
> > >   /usr/share/doc/SRCPKGNAME-headers-PKGVER-ABINUM/debian.README.gz for details
> > >  
> > >  Package: SRCPKGNAME-libc-dev
> > > -Architecture: amd64 armhf arm64 x32 ppc64el s390x
> > > +Architecture: amd64 armhf arm64 ppc64el s390x
> > >  Depends: ${misc:Depends}
> > >  Conflicts: SRCPKGNAME-kernel-headers
> > >  Replaces: SRCPKGNAME-kernel-headers
> > > -- 
> > > 2.20.1
> > > 
> > > 
> > > -- 
> > > kernel-team mailing list
> > > kernel-team at lists.ubuntu.com
> > > https://lists.ubuntu.com/mailman/listinfo/kernel-team