From patchwork Mon Apr 28 09:21:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 29189 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id AE494202FE for ; Mon, 28 Apr 2014 09:23:45 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id gq1sf39806980obb.2 for ; Mon, 28 Apr 2014 02:23:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:message-id:from:to:date:in-reply-to :references:organization:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=4TOVFVqiAyOSZBarZb7ZrQki3L06/ZHhduQdX83mPfQ=; b=WwN/S2TB7oMlrqATZlIhptqCkVLKWK+gBUSGJhGm5RpCvFt/vZBISSFTilbRvFcD0t gV9vhxdtBuhKriJtQ1h2g3lie7KeqEJqnxtGtplkDktDUNcwP1kV+9SvfBX9ibFI4uJV LtF2pz6k7A0cCYGG/OhLfeZd9FiW7YuQeooyxVcKGO5BXRoTaU4ODqVcCdochVxsAijg BT0DzgVn3QKImUz8aoINysAgg45e8JN3W1E7chOJoiVs3tMegGt54sbbPpdmRGiexauY vCpc0wafK09wHyFt/IaQjwB404DuvZ9tDklfsH1ahlxmNglU0SX37piP9OVAvXMf2nsd de9Q== X-Gm-Message-State: ALoCoQm+cvXGVqHmuveO/hAuATKJgfaNZ1DeNbaVyfV1mAqzdlBiaZsRAEcOGo7rz+iynDnbynts X-Received: by 10.183.11.102 with SMTP id eh6mr12504699obd.37.1398677025278; Mon, 28 Apr 2014 02:23:45 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.108.180 with SMTP id j49ls69677qgf.89.gmail; Mon, 28 Apr 2014 02:23:45 -0700 (PDT) X-Received: by 10.58.202.106 with SMTP id kh10mr110764vec.31.1398677025136; Mon, 28 Apr 2014 02:23:45 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id is3si3495895vec.45.2014.04.28.02.23.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 28 Apr 2014 02:23:45 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id jx11so7820510veb.3 for ; Mon, 28 Apr 2014 02:23:45 -0700 (PDT) X-Received: by 10.52.183.228 with SMTP id ep4mr1927429vdc.30.1398677025053; Mon, 28 Apr 2014 02:23:45 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp102457vcb; Mon, 28 Apr 2014 02:23:44 -0700 (PDT) X-Received: by 10.140.107.198 with SMTP id h64mr5255092qgf.30.1398677023961; Mon, 28 Apr 2014 02:23:43 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id i96si7525535qge.153.2014.04.28.02.23.43 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 28 Apr 2014 02:23:43 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WehlD-0007Q8-Ha; Mon, 28 Apr 2014 09:22:03 +0000 Received: from mail6.bemta4.messagelabs.com ([85.158.143.247]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1WehlB-0007Pu-Ub for xen-devel@lists.xensource.com; Mon, 28 Apr 2014 09:22:02 +0000 Received: from [85.158.143.35:47422] by server-3.bemta-4.messagelabs.com id 2E/6F-13602-9BD1E535; Mon, 28 Apr 2014 09:22:01 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-15.tower-21.messagelabs.com!1398676919!1407677!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.11.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23932 invoked from network); 28 Apr 2014 09:22:00 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-15.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 28 Apr 2014 09:22:00 -0000 X-IronPort-AV: E=Sophos;i="4.97,942,1389744000"; d="scan'208";a="125303065" Received: from accessns.citrite.net (HELO FTLPEX01CL02.citrite.net) ([10.9.154.239]) by FTLPIPO01.CITRIX.COM with ESMTP; 28 Apr 2014 09:21:59 +0000 Received: from [10.80.2.80] (10.80.2.80) by FTLPEX01CL02.citrite.net (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Mon, 28 Apr 2014 05:21:58 -0400 Message-ID: <1398676917.29700.10.camel@kazak.uk.xensource.com> From: Ian Campbell To: xen.org Date: Mon, 28 Apr 2014 10:21:57 +0100 In-Reply-To: <1398671306.23380.84.camel@dagon.hellion.org.uk> References: <1398589858.23380.73.camel@dagon.hellion.org.uk> <1398596651.19277.114.camel@hastur.hellion.org.uk> <1398671306.23380.84.camel@dagon.hellion.org.uk> Organization: Citrix Systems, Inc. X-Mailer: Evolution 3.8.5-2+b3 MIME-Version: 1.0 X-Originating-IP: [10.80.2.80] X-DLP: MIA2 Cc: xen-devel@lists.xensource.com Subject: Re: [Xen-devel] [xen-unstable test] 26014: trouble: blocked/broken/pass X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ian.campbell@citrix.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: On Mon, 2014-04-28 at 08:48 +0100, Ian Campbell wrote: > This has happened with both of the two kernel (3.12 and 3.13) which I've > pulled from backports. It looks like we might need a newer version of > depmod/modprobe et al. This is going to involve some poking to figure > out... It turns out to be much more mundane, when repacking the kernel for use in the installer initrd we don't include all modules (would be huge) and we weren't including the crypto modules, yet sd_mod.ko has grown a dependency on them. Since I think my current workaround is going to succeed I have not yet pushed the following, but we should plan to do so at some point I think. I have tested it successfully in my local environment. (nb: I'm about to post a series adding some Debian tests which require changes to mg-debian-installer-update -- that would be a good juncture to do this update I think) Ian. 8<-------- >From 12c07a2cf2cd022e5f6b8f2e14c579ad99eeb15f Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 28 Apr 2014 10:18:38 +0100 Subject: [PATCH] mg-debian-installer-update: Updates for newer armhf kernels from backports. In newer kernels sd_mod.ko requires crypto symbols, so include kernel/crypto/*.ko in the installer overlay cpio. Also prefer the newest versions of packages pulled in from backports, by reversing the sort. Anchor the linux-image package name to we only pick up the -armmp flavour and not -armmp-lpae (which is unnecessary in an installer environment). Signed-off-by: Ian Campbell --- mg-debian-installer-update | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mg-debian-installer-update b/mg-debian-installer-update index 452a2ad..0398c60 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -93,7 +93,7 @@ if [ $arch = armhf ]; then # Newer kernel often needs a newer initramfs-tools. Make that available echo >&2 "collecting backports initramfs-tools" - pkgfile=`bzcat Packages.bz2 | grep-dctrl -PX initramfs-tools -nsFilename | sort -n | head -n1` + pkgfile=`bzcat Packages.bz2 | grep-dctrl -PX initramfs-tools -nsFilename | sort -n -r | head -n1` rc=$? set -e if [ $rc != 0 ]; then fail "initramfs-tools package not found"; fi @@ -103,7 +103,7 @@ if [ $arch = armhf ]; then echo >&2 "collecting armmp kernel" # Be careful to pickup the actual kernel package from the 'linux' # source and not a meta package from 'linux-latest' - pkgfile=`bzcat Packages.bz2 | grep-dctrl -S linux | grep-dctrl -Pe linux-image-.*-armmp -nsFilename | sort -n | head -n1` + pkgfile=`bzcat Packages.bz2 | grep-dctrl -S linux | grep-dctrl -Pe ^linux-image-.*-armmp$ -nsFilename | sort -n -r | head -n1` rc=$? set -e if [ $rc != 0 ]; then fail "armmp kernel package not found"; fi @@ -117,6 +117,7 @@ if [ $arch = armhf ]; then -o -type f -name modules.\* \ -o -type f -name \*.ko \ \( -path \*/kernel/lib/\* -o \ + -path \*/kernel/crypto/\* -o \ -path \*/kernel/fs/mbcache.ko -o \ -path \*/kernel/fs/ext\* -o \ -path \*/kernel/fs/jbd\* -o \