From patchwork Sat Oct 31 11:38:49 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 37361 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id C3C68B7BFD for ; Sat, 31 Oct 2009 22:39:03 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1N4CII-0002Hq-WB; Sat, 31 Oct 2009 11:38:55 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.60) (envelope-from ) id 1N4CIE-0002HD-Df for kernel-team@lists.canonical.com; Sat, 31 Oct 2009 11:38:50 +0000 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1N4CIE-0006R9-8z for ; Sat, 31 Oct 2009 11:38:50 +0000 Received: from 79-70-81-156.dynamic.dsl.as9105.com ([79.70.81.156] helo=canonical.com) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.69) (envelope-from ) id 1N4CID-0006hq-Sa for kernel-team@lists.canonical.com; Sat, 31 Oct 2009 11:38:50 +0000 From: Stefan Bader To: kernel-team@lists.canonical.com Subject: [Karmic] SRU: Fix virtual package build on i386 Date: Sat, 31 Oct 2009 11:38:49 +0000 Message-Id: <1256989129-3054-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.6.3.3 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.8 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com SRU Justification: Impact: Running the kernel build from within debuild (which is done by the buildds) seems to imply the -e shell option being set. This in turn causes the copy loop, which takes modules from one main flavour to the subflavour, to exit on the first wildcard rule which fails to find any files. This is the case as with the "drivers/xen/*" line. Everything after that is not going into the package. Fix: Prevent the find command in the script from being a failure point. If no files are found, just continue. [The patch also fixes a small issue on printing the copied modules to stdout. Before only the main module was printed multiple times, if there were depending modules. Now the real module name is printed] Testcase: Run "debuild -B" for the i386 architecture. Without this patch, there are quite a lot modules missing. (Tested in PPA) -Stefan From ddcb071a37a446cb6ae62e4c6324daf55629c140 Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Fri, 30 Oct 2009 17:26:27 +0000 Subject: [PATCH] UBUNTU: SAUCE: Fix sub-flavour script to not stop on missing directories BugLink: http://bugs.launchpad.net/bugs/453073 The way the builders run the sub-flavour script seems to include setting an option to exit loops when an error occurs within that loop. This will happen when a wildcard entry is not found. Fix this by catching the error condition and while being on it also fix the name printed on install. Signed-off-by: Stefan Bader Acked-by: Colin King Acked-by: Andy Whitcroft --- debian.master/scripts/sub-flavour | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/debian.master/scripts/sub-flavour b/debian.master/scripts/sub-flavour index a5b7484..c0093a6 100644 --- a/debian.master/scripts/sub-flavour +++ b/debian.master/scripts/sub-flavour @@ -27,7 +27,7 @@ do # if echo "$line" | grep '\*' > /dev/null then - if [ `eval find "$line" -name '*.ko'|wc -l` -lt 1 ] + if [ `eval find "$line" -name '*.ko' 2>/dev/null|wc -l` -lt 1 ] then echo SUB_INST Warning - No files in $line fi @@ -46,7 +46,7 @@ cat ${DEBIAN}/sub-flavours/$TO.list | while read line; do cd debian/$from_pkg/lib/modules/$ABI_RELEASE-$FROM/kernel; if echo "$line" | grep '\*' > /dev/null then - eval find "$line" -name '*.ko' + eval find "$line" -name '*.ko' 2>/dev/null || true elif [ -f "$line" ] then echo "$line" @@ -60,7 +60,7 @@ done | while read mod; do while read m; do m="${fromdir}$m" test -f debian/$to_pkg/$m && continue - echo "SUB_INST installing: $mod" + echo "SUB_INST installing: $m" install -D -m644 debian/$from_pkg/$m \ debian/$to_pkg/$m done