From patchwork Thu May 12 16:32:22 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 621678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 3r5JS71GRHz9sds; Fri, 13 May 2016 02:32:39 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1b0tXP-0002aK-N4; Thu, 12 May 2016 16:32:35 +0000 Received: from mail-wm0-f48.google.com ([74.125.82.48]) by huckleberry.canonical.com with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.76) (envelope-from ) id 1b0tXH-0002ZI-1s for kernel-team@lists.ubuntu.com; Thu, 12 May 2016 16:32:27 +0000 Received: by mail-wm0-f48.google.com with SMTP id e201so265749290wme.0 for ; Thu, 12 May 2016 09:32:27 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=6Y5BiRsQopmSYGc5ljNV+c/jAwwXJ2xMxFW2dGogzss=; b=cGpQbG8bJ6KWG1Lpm2+F+6E06nvHOu+uclx341c0tLGtnSQoYGchCPci789ISqc+dM sbWX5mgah7HHMmdQvHWypfxVffB1yshJ0qrWt0ucLWJx6p3tgeyLSJ+h1TF/za7r2OEf Z3C5tgvjWUXxfDcqu3Qfxwu7tXiS9umNA2Iht85FnvB0R1EavGqbUiuFuMypGx0HuL/E rQ2DvF5eBi8vzyfIUgEnddjz/0nCQvBgb8Fiy4SoL2EJBatECdm8lSy5Bw4/IB3QJfUn c1fdvfHD0h23CXKlEgqBxx5gC7T5kOMqC1gFBV9sRgPHG5S38lfXXrV5cCkDIxktWZZ6 bW4w== X-Gm-Message-State: AOPr4FUUP1JFrflIL2YpKt/AtSepHnfloI24XervgHmDKFGOs/j5Y5D6xTT0sUy0Q54NtGYj X-Received: by 10.28.97.9 with SMTP id v9mr11018157wmb.45.1463070746560; Thu, 12 May 2016 09:32:26 -0700 (PDT) Received: from localhost ([2001:470:6973:2:7144:7ff5:41f9:85aa]) by smtp.gmail.com with ESMTPSA id y70sm14617522wmd.3.2016.05.12.09.32.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 May 2016 09:32:25 -0700 (PDT) From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [xenial/master-next 1/1] UBUNTU: [Packaging] disable zfs module checks when cross-compiling Date: Thu, 12 May 2016 17:32:22 +0100 Message-Id: <1463070742-18767-2-git-send-email-apw@canonical.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1463070742-18767-1-git-send-email-apw@canonical.com> References: <1463070742-18767-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com When we cross-compile we have to turn off the inbuilt zfs modules. When doing this we also need to allow the modules so produced to go missing in this build while still checking the remainder of the modules. BugLink: http://bugs.launchpad.net/bugs/1581127 Signed-off-by: Andy Whitcroft --- debian/rules | 1 + debian/zfs-modules.ignore | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 debian/zfs-modules.ignore diff --git a/debian/rules b/debian/rules index 780d000..f2e801c 100755 --- a/debian/rules +++ b/debian/rules @@ -42,6 +42,7 @@ ifneq ($(DEB_HOST_ARCH),$(DEB_BUILD_ARCH)) do_tools=false disable_d_i=true do_zfs=false + do_zfs_disable:=$(shell cat $(DROOT)/zfs-modules.ignore >>$(prev_abidir)/../modules.ignore) endif # Stages -- support both DEB_STAGE=stage1 and DEB_BUILD_PROFILE=bootstrap diff --git a/debian/zfs-modules.ignore b/debian/zfs-modules.ignore new file mode 100644 index 0000000..9529d23 --- /dev/null +++ b/debian/zfs-modules.ignore @@ -0,0 +1,8 @@ +spl +splat +zavl +zcommon +zfs +znvpair +zpios +zunicode