[PATCH 0/2][E] Remove support for producing i386 kernels

classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH 0/2][E] Remove support for producing i386 kernels

Seth Forshee
BugLink: https://bugs.launchpad.net/bugs/1845714

SRU Justification

Impact: i386 will not be a supported architecture in 19.10, so we should
drop it from our packaging. However we will still need to support i386
in hwe kernels.

Fix: Stop building i386 packages, but keep the configs and other bits
for supporting i386 in place.

Test Case: Verify that i386 kernels are no longer produced, but that
configs can still be updated.

Regression Potential: The changes are straightforward, and any
regressions are likely to be build-time issues, so regressions impacting
users are unlikely.

Thanks,
Seth


Seth Forshee (2):
  UBUNTU: [Debian] Remove support for producing i386 kernels
  UBUNTU: [Debian] Don't use CROSS_COMPILE for i386 configs

 debian.master/control.d/vars.generic    |  6 +++---
 debian.master/control.d/vars.lowlatency |  6 +++---
 debian.master/control.stub.in           | 14 +++++++-------
 debian.master/etc/getabis               |  1 -
 debian/scripts/misc/kernelconfig        |  9 +++++++--
 5 files changed, 20 insertions(+), 16 deletions(-)

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 1/2][E] UBUNTU: [Debian] Remove support for producing i386 kernels

Seth Forshee
BugLink: https://bugs.launchpad.net/bugs/1845714

i386 will not be a supported architecture in eoan, so drop i386
from our kernel packaging. However, we will still be building
i386 hwe kernel based on eoan, so we will keep the configs and
other bits required for i386 in place.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian.master/control.d/vars.generic    |  6 +++---
 debian.master/control.d/vars.lowlatency |  6 +++---
 debian.master/control.stub.in           | 14 +++++++-------
 debian.master/etc/getabis               |  1 -
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/debian.master/control.d/vars.generic b/debian.master/control.d/vars.generic
index 2cda0bf1e404..139a9f3135c8 100644
--- a/debian.master/control.d/vars.generic
+++ b/debian.master/control.d/vars.generic
@@ -1,6 +1,6 @@
-arch="i386 amd64 armhf arm64 ppc64el s390x"
+arch="amd64 armhf arm64 ppc64el s390x"
 supported="Generic"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo [i386 amd64 x32] | flash-kernel [armhf arm64] | grub-ieee1275 [ppc64el]"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [i386 amd64 x32]"
+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]"
diff --git a/debian.master/control.d/vars.lowlatency b/debian.master/control.d/vars.lowlatency
index 9849cd3144dc..08a98dbd0fc5 100644
--- a/debian.master/control.d/vars.lowlatency
+++ b/debian.master/control.d/vars.lowlatency
@@ -1,6 +1,6 @@
-arch="i386 amd64"
+arch="amd64"
 supported="Lowlatency"
 target="Geared toward desktop and server systems."
 desc="=HUMAN= SMP"
-bootloader="grub-pc [i386 amd64 x32] | grub-efi-amd64 [amd64 x32] | grub-efi-ia32 [i386 amd64 x32] | grub [i386 amd64 x32] | lilo [i386 amd64 x32] | flash-kernel [armhf arm64]"
-provides="kvm-api-4, redhat-cluster-modules, ivtv-modules, virtualbox-guest-modules [i386 amd64 x32]"
+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]"
diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in
index 84219114b1d7..85a7d3412f40 100644
--- a/debian.master/control.stub.in
+++ b/debian.master/control.stub.in
@@ -9,7 +9,7 @@ Build-Depends:
  cpio,
  kernel-wedge,
  kmod <!stage1>,
- makedumpfile [amd64 i386] <!stage1>,
+ makedumpfile [amd64] <!stage1>,
  libelf-dev <!stage1>,
  libnewt-dev <!stage1>,
  libiberty-dev <!stage1>,
@@ -21,7 +21,7 @@ Build-Depends:
  pkg-config <!stage1>,
  flex <!stage1>,
  bison <!stage1>,
- libunwind8-dev [amd64 arm64 armhf i386 ppc64el] <!stage1>,
+ libunwind8-dev [amd64 arm64 armhf ppc64el] <!stage1>,
  liblzma-dev <!stage1>,
  openssl <!stage1>,
  libssl-dev <!stage1>,
@@ -34,10 +34,10 @@ Build-Depends:
  automake <!stage1>,
  libtool <!stage1>,
  uuid-dev <!stage1>,
- libnuma-dev [amd64 arm64 i386 ppc64el s390x] <!stage1>,
+ libnuma-dev [amd64 arm64 ppc64el s390x] <!stage1>,
  dkms <!stage1>,
  wget <!stage1>,
- lz4 [amd64 i386 s390x] <!stage1>,
+ lz4 [amd64 s390x] <!stage1>,
 Build-Depends-Indep:
  xmlto <!stage1>,
  docbook-utils <!stage1>,
@@ -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: i386 amd64 armhf arm64 x32 ppc64el s390x
+Architecture: amd64 armhf arm64 x32 ppc64el s390x
 Depends: ${misc:Depends}
 Conflicts: SRCPKGNAME-kernel-headers
 Replaces: SRCPKGNAME-kernel-headers
@@ -130,7 +130,7 @@ Description: Linux kernel version specific tools for version PKGVER
 
 Package: SRCPKGNAME-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
-Architecture: i386 amd64 armhf arm64 ppc64el s390x
+Architecture: amd64 armhf arm64 ppc64el s390x
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-tools-common
@@ -154,7 +154,7 @@ Description: Linux kernel version specific cloud tools for version PKGVER
 
 Package: SRCPKGNAME-cloud-tools-PKGVER-ABINUM
 Build-Profiles: <!stage1>
-Architecture: i386 amd64 armhf
+Architecture: amd64 armhf
 Section: devel
 Priority: optional
 Depends: ${misc:Depends}, ${shlibs:Depends}, linux-cloud-tools-common
diff --git a/debian.master/etc/getabis b/debian.master/etc/getabis
index 93efb3cc6165..ff0e3601b38e 100644
--- a/debian.master/etc/getabis
+++ b/debian.master/etc/getabis
@@ -11,7 +11,6 @@ package_prefixes linux-buildinfo
 getall armhf generic
 getall armhf generic-lpae
 getall amd64 generic lowlatency
-getall i386 generic lowlatency
 getall arm64 generic
 getall ppc64el generic
 getall s390x generic
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[PATCH 2/2][E] UBUNTU: [Debian] Don't use CROSS_COMPILE for i386 configs

Seth Forshee
In reply to this post by Seth Forshee
BugLink: https://bugs.launchpad.net/bugs/1845714

Since i386 support is being removed in eoan, we will no longer
have cross toolchains to use when updating configs. Stop setting
CROSS_COMPILE for i386 so that the host toolchain will be used
instead.

Signed-off-by: Seth Forshee <[hidden email]>
---
 debian/scripts/misc/kernelconfig | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/scripts/misc/kernelconfig b/debian/scripts/misc/kernelconfig
index 9795f678a9db..9231fb1dfb2c 100755
--- a/debian/scripts/misc/kernelconfig
+++ b/debian/scripts/misc/kernelconfig
@@ -60,8 +60,13 @@ for arch in $archs; do
  deb_host_arch=$(dpkg-architecture -qDEB_HOST_ARCH -a$arch 2>/dev/null)
  [ $deb_build_arch != $deb_host_arch ] && cross_compile="$(dpkg-architecture -qDEB_HOST_GNU_TYPE -a$arch 2>/dev/null)-"
 
- # Environment variables for 'make *config'
- env="ARCH=$kernarch CROSS_COMPILE=$cross_compile"
+ # Environment variables for 'make *config'. We omit CROSS_COMPILE
+ # for i386 since it is no longer supported after 19.04, however
+ # we maintain the configs for hwe.
+ env="ARCH=$kernarch"
+ if [ "$arch" != "i386" ]; then
+ env="$env CROSS_COMPILE=$cross_compile"
+ fi
 
  archconfdir=$confdir/$arch
  flavourconfigs=$(cd $archconfdir && ls config.flavour.*)
--
2.20.1


--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

[Acked] [PATCH 0/2][E] Remove support for producing i386 kernels

Andy Whitcroft-3
In reply to this post by Seth Forshee
On Fri, Sep 27, 2019 at 03:20:31PM -0500, Seth Forshee wrote:

> BugLink: https://bugs.launchpad.net/bugs/1845714
>
> SRU Justification
>
> Impact: i386 will not be a supported architecture in 19.10, so we should
> drop it from our packaging. However we will still need to support i386
> in hwe kernels.
>
> Fix: Stop building i386 packages, but keep the configs and other bits
> for supporting i386 in place.
>
> Test Case: Verify that i386 kernels are no longer produced, but that
> configs can still be updated.
>
> Regression Potential: The changes are straightforward, and any
> regressions are likely to be build-time issues, so regressions impacting
> users are unlikely.
>
> Thanks,
> Seth
>
>
> Seth Forshee (2):
>   UBUNTU: [Debian] Remove support for producing i386 kernels
>   UBUNTU: [Debian] Don't use CROSS_COMPILE for i386 configs
>
>  debian.master/control.d/vars.generic    |  6 +++---
>  debian.master/control.d/vars.lowlatency |  6 +++---
>  debian.master/control.stub.in           | 14 +++++++-------
>  debian.master/etc/getabis               |  1 -
>  debian/scripts/misc/kernelconfig        |  9 +++++++--
>  5 files changed, 20 insertions(+), 16 deletions(-)

Acked-by: Andy Whitcroft <[hidden email]>

Looks very sensible. I assume we will need to revert the i386 configs
bit in the linux-hwe this makes.

-apw

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

ACK: [PATCH 0/2][E] Remove support for producing i386 kernels

Tyler Hicks-2
In reply to this post by Seth Forshee
On 2019-09-27 15:20:31, Seth Forshee wrote:

> BugLink: https://bugs.launchpad.net/bugs/1845714
>
> SRU Justification
>
> Impact: i386 will not be a supported architecture in 19.10, so we should
> drop it from our packaging. However we will still need to support i386
> in hwe kernels.
>
> Fix: Stop building i386 packages, but keep the configs and other bits
> for supporting i386 in place.
>
> Test Case: Verify that i386 kernels are no longer produced, but that
> configs can still be updated.
>
> Regression Potential: The changes are straightforward, and any
> regressions are likely to be build-time issues, so regressions impacting
> users are unlikely.

Acked-by: Tyler Hicks <[hidden email]>

Tyler

>
> Thanks,
> Seth
>
>
> Seth Forshee (2):
>   UBUNTU: [Debian] Remove support for producing i386 kernels
>   UBUNTU: [Debian] Don't use CROSS_COMPILE for i386 configs
>
>  debian.master/control.d/vars.generic    |  6 +++---
>  debian.master/control.d/vars.lowlatency |  6 +++---
>  debian.master/control.stub.in           | 14 +++++++-------
>  debian.master/etc/getabis               |  1 -
>  debian/scripts/misc/kernelconfig        |  9 +++++++--
>  5 files changed, 20 insertions(+), 16 deletions(-)
>
> --
> kernel-team mailing list
> [hidden email]
> https://lists.ubuntu.com/mailman/listinfo/kernel-team

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team
Reply | Threaded
Open this post in threaded view
|

APPLIED: [PATCH 0/2][E] Remove support for producing i386 kernels

Seth Forshee
In reply to this post by Seth Forshee
On Fri, Sep 27, 2019 at 03:20:31PM -0500, Seth Forshee wrote:

> BugLink: https://bugs.launchpad.net/bugs/1845714
>
> SRU Justification
>
> Impact: i386 will not be a supported architecture in 19.10, so we should
> drop it from our packaging. However we will still need to support i386
> in hwe kernels.
>
> Fix: Stop building i386 packages, but keep the configs and other bits
> for supporting i386 in place.
>
> Test Case: Verify that i386 kernels are no longer produced, but that
> configs can still be updated.
>
> Regression Potential: The changes are straightforward, and any
> regressions are likely to be build-time issues, so regressions impacting
> users are unlikely.
>
> Thanks,
> Seth

Applied to eoan/master-next.

--
kernel-team mailing list
[hidden email]
https://lists.ubuntu.com/mailman/listinfo/kernel-team