From patchwork Fri Jan 20 12:19:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Jackson X-Patchwork-Id: 9528163 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4783660459 for ; Fri, 20 Jan 2017 12:23:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3915028560 for ; Fri, 20 Jan 2017 12:23:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DEDA28616; Fri, 20 Jan 2017 12:23:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DDD8828560 for ; Fri, 20 Jan 2017 12:23:21 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUYCi-0001sg-HD; Fri, 20 Jan 2017 12:22:04 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cUYCg-0001nn-Jr for xen-devel@lists.xenproject.org; Fri, 20 Jan 2017 12:22:02 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 54/67-25360-9E002885; Fri, 20 Jan 2017 12:22:01 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpmkeJIrShJLcpLzFFi42JxWrrBXvc5Q1O EwdkJrBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa0b3gmXMBbM4Kl5fu8XawHiTrYuRk0NCwF+i 6/ZBVhCbTUBXomnLX6A4B4eIgIrE7b0GIGFmAW2JvevmMoPYwgIJEv+ezgazWQRUJZq7OsFsX gEviQ97brBCjJSTOH/8J1icEyi+oXMbmC0k4CnR+OcnI8h4IQE1ibnr4yFaBSVOznzCArFKQu LgixfMExh5ZyFJzUKSWsDItIpRozi1qCy1SNfYQC+pKDM9oyQ3MTNH19DAVC83tbg4MT01JzG pWC85P3cTIzBw6hkYGHcwTljld4hRkoNJSZR398eGCCG+pPyUyozE4oz4otKc1OJDjDIcHEoS vBX/GyOEBItS01Mr0jJzgCEMk5bg4FES4e0HSfMWFyTmFmemQ6ROMSpKifPGgiQEQBIZpXlwb bC4ucQoKyXMy8jAwCDEU5BalJtZgir/ilGcg1FJmLcNZApPZl4J3PRXQIuZgBZbKdeDLC5JRE hJNTDmz4kuSMlfHT+v/8MSMd6ozx4reoSaTx+rUXCO3e3y4NiHO3NtX1sz8Vre9ZmlspEzWEA 1T89GqmS57KILImYK3v1PN72Zcu5C71z3aSu97zfyGq94osH9z16IoWcqr/fi9Vu9nymqK1rc sikM/LDEND/cl2Gz8/Us87R13mnNXzlXbEwNVlNiKc5INNRiLipOBADM9Uc7lgIAAA== X-Env-Sender: prvs=18694997c=Ian.Jackson@citrix.com X-Msg-Ref: server-16.tower-206.messagelabs.com!1484914908!65061046!6 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.1.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 39001 invoked from network); 20 Jan 2017 12:21:58 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-16.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 20 Jan 2017 12:21:58 -0000 X-IronPort-AV: E=Sophos;i="5.33,258,1477958400"; d="scan'208";a="409819397" From: Ian Jackson To: Date: Fri, 20 Jan 2017 12:19:22 +0000 Message-ID: <1484914764-20861-34-git-send-email-ian.jackson@eu.citrix.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1484914764-20861-1-git-send-email-ian.jackson@eu.citrix.com> References: <1484914764-20861-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Cc: Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH 33/35] d-i: When using backports kernel, suppress kernel modules warning X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 0137fc4..06918ef 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -1124,12 +1124,15 @@ in-target tar -C /boot -xaf /tmp/dtbs.tar.gz END } + my $backports_kernel; + foreach my $kp (keys %{ $ho->{Flags} }) { # Backwards compatibility $kp = "need-kernel-deb-wheezy-backports" if $kp eq "need-kernel-deb-armmp"; $kp =~ s/need-kernel-deb-$ho->{Suite}-// or next; if ($kp eq 'backports') { + $backports_kernel = 1; preseed_backports_packages($ho, $sfx, \%xopts, $suite, qw(linux-base)); } @@ -1322,7 +1325,7 @@ END $preseed_file .= preseed_hook_cmds(); - if ($ho->{Flags}{'no-di-kernel'}) { + if ($backports_kernel || $ho->{Flags}{'no-di-kernel'}) { $preseed_file .= <