From patchwork Thu Oct 3 14:52:10 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Seth Forshee X-Patchwork-Id: 1171236 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 46kbZV5Hxxz9sP7; Fri, 4 Oct 2019 00:52:18 +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 1iG2Sl-0001zH-DE; Thu, 03 Oct 2019 14:52:15 +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 1iG2Sj-0001yk-2u for kernel-team@lists.ubuntu.com; Thu, 03 Oct 2019 14:52:13 +0000 Received: from mail-io1-f71.google.com ([209.85.166.71]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1iG2Si-00083O-RD for kernel-team@lists.ubuntu.com; Thu, 03 Oct 2019 14:52:12 +0000 Received: by mail-io1-f71.google.com with SMTP id w8so5493664iod.21 for ; Thu, 03 Oct 2019 07:52:12 -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:mime-version :content-transfer-encoding; bh=1y16TnzBmiCvDWRLt0lA+d7s+5W+ze4TMKnpfBghVl0=; b=gxiv1/4U3aTbv/Ujk7GxjLfSjj/ibSrT8a3DbnFs6FoYJMBkNal+U+NmOLacnfOZCc YQcDK9fKF76FthLMV+cz29kafrQD2CpWLozo6IfglNKqsRF2a1SnokkjucIR//2hRQhE fdkp9uBygHphdGNGjDc1xXGZe0NS78j8OPAitJpmmm/rFnbA+nkJojubVjtmjvvHEZBZ xF2xldEJ087kJNDU7cX7RI1K2FgRIwpB/+tfXrfZclOLEOUhe6sMcTb8kHLVxiYns2Jt uzuHPHEhpU8Mpgm42sRRoVX5EKnXoPA1x5xn9nafOoYaF+PDJ6T1VEONkB370HOaa3/K WjKQ== X-Gm-Message-State: APjAAAVZudOtpQ8TzKOwURFMb+Ogm7rL7ZqkgRfqy11atpIuAy/ERvwk a1KEdzs7yffMYmrO0TCptTCTArUFqA3qwsJb17sz+l1iOqZ5wLTT459sey5tK61QITXMGB372Fk KKhwst3S7zsmfz5QGy1dTt2Qevze+gqATXQ/aFj9oTA== X-Received: by 2002:a6b:c810:: with SMTP id y16mr8501255iof.75.1570114331649; Thu, 03 Oct 2019 07:52:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqxh7R/pdAPNvWThdCp6GRYVNopIxrTX97js9Vn0iOQ8//SG0zD9Mp4426UN8RQjnlFafbLRJg== X-Received: by 2002:a6b:c810:: with SMTP id y16mr8501235iof.75.1570114331258; Thu, 03 Oct 2019 07:52:11 -0700 (PDT) Received: from localhost ([2605:a601:ac3:9720:2c0b:3efd:6d52:cf78]) by smtp.gmail.com with ESMTPSA id l21sm959334iok.87.2019.10.03.07.52.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Oct 2019 07:52:10 -0700 (PDT) From: Seth Forshee To: kernel-team@lists.ubuntu.com Subject: [PATCH][SRU][E] UBUNTU: [Packaging] Build only linux-libc-dev for i386 Date: Thu, 3 Oct 2019 09:52:10 -0500 Message-Id: <20191003145210.10393-1-seth.forshee@canonical.com> X-Mailer: git-send-email 2.20.1 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" https://bugs.launchpad.net/bugs/1846508 Even though we aren't producing i386 kernels anymore, we still need to produce a linux-libc-dev package. Re-enable building only this package for i386. Signed-off-by: Seth Forshee Acked-by: Andrea Righi Acked-by: Colin Ian King --- debian.master/control.stub.in | 2 +- debian.master/rules.d/i386.mk | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/debian.master/control.stub.in b/debian.master/control.stub.in index c19ede1d451c..bf0a9f57bc67 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 ppc64el s390x +Architecture: amd64 armhf arm64 i386 ppc64el s390x Depends: ${misc:Depends} Conflicts: SRCPKGNAME-kernel-headers Replaces: SRCPKGNAME-kernel-headers diff --git a/debian.master/rules.d/i386.mk b/debian.master/rules.d/i386.mk index 06ac6ea33563..a0c64b72864b 100644 --- a/debian.master/rules.d/i386.mk +++ b/debian.master/rules.d/i386.mk @@ -9,12 +9,11 @@ install_file = vmlinuz loader = grub vdso = vdso_install no_dumpfile = true -do_tools_usbip = true -do_tools_cpupower = true -do_tools_perf = true -do_tools_perf_jvmti = true -do_tools_bpftool = true -do_tools_x86 = true -do_tools_hyperv = true -do_extras_package = true -do_dkms_vbox = true +do_flavour_image_package = false +do_tools = false +do_tools_common = false +do_extras_package = false +do_source_package = false +do_doc_package = false +do_flavour_header_package = false +do_common_headers_indep = false