From patchwork Thu Jul 21 17:24:23 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 106114 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 F36CCB6F70 for ; Fri, 22 Jul 2011 03:24:37 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qjwz6-0004am-1K; Thu, 21 Jul 2011 17:24:28 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1Qjwz4-0004ah-9z for kernel-team@lists.ubuntu.com; Thu, 21 Jul 2011 17:24:26 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1Qjwz4-0000wG-4z for ; Thu, 21 Jul 2011 17:24:26 +0000 Received: from p5b2e5798.dip.t-dialin.net ([91.46.87.152] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Qjwz3-0007MO-Uj for kernel-team@lists.ubuntu.com; Thu, 21 Jul 2011 17:24:26 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [Lucid-LBM SRU] Fix stupid packaging bug for wwan and input Date: Thu, 21 Jul 2011 19:24:23 +0200 Message-Id: <1311269063-16860-1-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.4.1 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 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: Due to a missing $ in the rules file, the modules for the input and wwan subpackages get picked up in a way that places the server flavour in all of the flavours. This causes the modules to fail loading on all flavours but the server one (could be slightly Acked-by: Leann Ogasawara Acked-by: Andy Whitcroft different on i386 but similar broken). Fix: Change the packaging script to look for the target flavour. Testcase: Installing and modprobing fails with an error and modinfo would show a different flavour than intended. -Stefan --- From d83cfb3cc4fcb09df86192e24028514c9d2157cb Mon Sep 17 00:00:00 2001 From: Stefan Bader Date: Thu, 21 Jul 2011 19:18:40 +0200 Subject: [PATCH] UBUNTU: SAUCE: Fix stupid packaging bug for wwan and input Brown paper bag time for me. By missing a single but important $ the find picked up all the build flavours and only one would end up in the package. Not necessarily the one intended... BugLink: http://bugs.launchpad.net/bugs/814186 Signed-off-by: Stefan Bader --- debian/rules.d/2-binary-arch.mk | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index f97ec86..21aa0c8 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -180,7 +180,7 @@ endif # Build the wwan-drivers packages. # install -d $(wwmoddir)/updates/wwan - find $(builddir)/build-*/wwan-drivers -type f -name '*.ko' | \ + find $(builddir)/build-$*/wwan-drivers -type f -name '*.ko' | \ while read f; do \ install -v $$f $(wwmoddir)/updates/wwan/; \ strip --strip-debug $(wwmoddir)/updates/wwan/$$(basename $$f); \ @@ -218,7 +218,7 @@ endif # Build the input-drivers package. # install -d $(immoddir)/updates/input - find $(builddir)/build-*/input-drivers -type f -name '*.ko' | \ + find $(builddir)/build-$*/input-drivers -type f -name '*.ko' | \ while read f; do \ install -v $$f $(immoddir)/updates/input/; \ strip --strip-debug $(immoddir)/updates/input/$$(basename $$f);\