From patchwork Fri Sep 27 20:20:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1168721 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46g38G1NmPz9sPG; Sat, 28 Sep 2019 06:20:45 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1iDwjH-0004mI-Uk; Fri, 27 Sep 2019 20:20:39 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iDwjF-0004lt-Rd for kernel-team@lists.ubuntu.com; Fri, 27 Sep 2019 20:20:37 +0000 Received: from mail-io1-f72.google.com ([209.85.166.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iDwjF-000867-J4 for kernel-team@lists.ubuntu.com; Fri, 27 Sep 2019 20:20:37 +0000 Received: by mail-io1-f72.google.com with SMTP id f5so14708269iob.17 for ; Fri, 27 Sep 2019 13:20:37 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EFaaWm1hOVTIDMMt9s9D3PX4LOGVQDdTYzkWD9UkVMQ=; b=Yzi3je/+cLMcKdK+qP71vikSYlaU1Og9n8xeF2vqyEWPcRY4gEjFD/8IASyeAdtHfK oj5zMPCEbZPpU6i2L02t48MIdiHh7GLNGR9p5nEGNwODHJkDM3HE0bRvxVt52afmMFlE eyjPciMbnbQDXbaOD4Qzjr+h3X8JsvVRHMxp54qqp22/VBBkYmIRPFnjEgzDJ0DsTPoS 55Vli68EgZM5rA5CTfKaF3HSJXvlR47yPeb9Jh5K1saF7cAi1G48NkbMR9WoTq9jmmI4 j5rJhvl23RvngIaMfocQG85PXOWmKf+egICVxaWo1Mz5MV9E3qfd60LrZhIz17+Q/icl PIlg== X-Gm-Message-State: APjAAAVjMJAJSw9xlg25MAXDDBYOn9kA/wUf/8+JJ3IeyxgTvSH3vkL2 AS0EdWI6BxbRFuiMVKToxXxxZj4BIdzawegYHZjFHLfK4XzJCE6mt9sJDAonYyz7eEsOz076LkE 44iOYzPnaOVP/jdnupwWrjm0Uk+b7fkaULGMEFzzNIQ== X-Received: by 2002:a6b:cd81:: with SMTP id d123mr10971473iog.78.1569615636485; Fri, 27 Sep 2019 13:20:36 -0700 (PDT) X-Google-Smtp-Source: APXvYqw2Cm4iwoe/Euh1fA3l7W3GeNzudXgo5C02qomS3e+3hlc2F6lxQXq2Yt4gs7bMSTjAd18QMg== X-Received: by 2002:a6b:cd81:: with SMTP id d123mr10971452iog.78.1569615636232; Fri, 27 Sep 2019 13:20:36 -0700 (PDT) Received: from localhost ([2605:a601:ac3:9720:4dd1:efb0:71b2:398e]) by smtp.gmail.com with ESMTPSA id c8sm2783318iol.57.2019.09.27.13.20.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 27 Sep 2019 13:20:35 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2][E] UBUNTU: [Debian] Remove support for producing i386 kernels Date: Fri, 27 Sep 2019 15:20:32 -0500 Message-Id: <20190927202033.12768-2-seth.forshee@canonical.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190927202033.12768-1-seth.forshee@canonical.com> References: <20190927202033.12768-1-seth.forshee@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" 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 --- 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 , - makedumpfile [amd64 i386] , + makedumpfile [amd64] , libelf-dev , libnewt-dev , libiberty-dev , @@ -21,7 +21,7 @@ Build-Depends: pkg-config , flex , bison , - libunwind8-dev [amd64 arm64 armhf i386 ppc64el] , + libunwind8-dev [amd64 arm64 armhf ppc64el] , liblzma-dev , openssl , libssl-dev , @@ -34,10 +34,10 @@ Build-Depends: automake , libtool , uuid-dev , - libnuma-dev [amd64 arm64 i386 ppc64el s390x] , + libnuma-dev [amd64 arm64 ppc64el s390x] , dkms , wget , - lz4 [amd64 i386 s390x] , + lz4 [amd64 s390x] , Build-Depends-Indep: xmlto , docbook-utils , @@ -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: -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: -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