From patchwork Thu Jul 5 12:46:06 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Whitcroft X-Patchwork-Id: 169144 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 966F42C01D3 for ; Thu, 5 Jul 2012 22:46:32 +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 1SmlRo-0001zk-LN; Thu, 05 Jul 2012 12:46:16 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SmlRl-0001yi-5P for kernel-team@lists.ubuntu.com; Thu, 05 Jul 2012 12:46:13 +0000 Received: from 79-78-215-204.dynamic.dsl.as9105.com ([79.78.215.204] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SmlRk-0005Wt-RR; Thu, 05 Jul 2012 12:46:13 +0000 From: Andy Whitcroft To: kernel-team@lists.ubuntu.com Subject: [oneiric 2/3] UBUNTU: [Packaging] getabis should be extracting all packages Date: Thu, 5 Jul 2012 13:46:06 +0100 Message-Id: <1341492369-24650-3-git-send-email-apw@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1341492369-24650-1-git-send-email-apw@canonical.com> References: <1341492369-24650-1-git-send-email-apw@canonical.com> Cc: Andy Whitcroft 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 We should be extracting both the linux-image and linux-image-extras packages when calculating the ABI and module lists. BugLink: http://bugs.launchpad.net/bugs/1021174 Signed-off-by: Andy Whitcroft --- debian/scripts/misc/getabis | 37 ++++++++++++++++++++++++++++--------- 1 file changed, 28 insertions(+), 9 deletions(-) diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis index 708b7b2..b35639c 100755 --- a/debian/scripts/misc/getabis +++ b/debian/scripts/misc/getabis @@ -23,6 +23,10 @@ fwinfo=$abidir/fwinfo test -d $tmpdir || mkdir $tmpdir +package_prefixes() { + __package_prefixes="$@" +} + getall() { arch=$1 shift @@ -35,17 +39,30 @@ getall() { continue fi echo -n "Fetching $sub..." - filename=linux-image-${verabi}-${sub}_${verfull}_${arch}.deb + prefixes="" + filenames="" cd $tmpdir - for r in "${repo_list[@]}" + for prefix in $__package_prefixes do - if ! [ -f $filename ]; then - $WGET $r/$filename - fi + filename=${prefix}-${verabi}-${sub}_${verfull}_${arch}.deb + for r in "${repo_list[@]}" + do + if ! [ -f $filename ]; then + $WGET $r/$filename + fi + if [ -f $filename ]; then + prefixes="$prefixes $prefix" + filenames="$filenames $filename" + break + fi + done done - if [ "$?" = "0" ]; then - echo -n "extracting..." - dpkg-deb --extract $filename tmp + if [ "$filenames" != "" ]; then + echo -n "extracting$prefixes..." + for filename in $filenames + do + dpkg-deb --extract $filename tmp + done find tmp -name "*.ko" | while read f; do modinfo $f | grep ^firmware >> $fwinfo done @@ -71,7 +88,7 @@ getall() { version=`cat $abidir/$arch/$sub.compiler` echo -n "$version..." ) - rm -rf tmp $filename + rm -rf tmp $filenames echo "done." else echo "FAILED." @@ -89,6 +106,8 @@ echo $abi > $abidir/abiname # NOTE: The flavours are hardcoded, because they may have changed from the # current build. +__package_prefixes="linux-image" + . $DEBIAN/etc/getabis compilers=`cat $abidir/*/*.compiler | sort -u | wc -l`