From patchwork Wed Jul 18 00:35:09 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 171578 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 232892C00CD for ; Wed, 18 Jul 2012 10:35:34 +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 1SrIEc-0001Pk-EZ; Wed, 18 Jul 2012 00:35:22 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1SrIEZ-0001Ov-Rp for kernel-team@lists.ubuntu.com; Wed, 18 Jul 2012 00:35:19 +0000 Received: from 74-95-45-185-oregon.hfc.comcastbusiness.net ([74.95.45.185] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1SrIEZ-0007F3-F9 for kernel-team@lists.ubuntu.com; Wed, 18 Jul 2012 00:35:19 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH quantal, precise, oneiric] UBUNTU: [Config] getabis enhancements Date: Tue, 17 Jul 2012 17:35:09 -0700 Message-Id: <1342571713-10852-2-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342571713-10852-1-git-send-email-stefan.bader@canonical.com> References: <1342571713-10852-1-git-send-email-stefan.bader@canonical.com> 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 - Allow to define DEBIAN to be run standalone - Limit the amount of time wget waits for connections - Prevent exposing some errors when called by python script - Print architecture of downloaded packages Signed-off-by: Stefan Bader --- debian/scripts/misc/getabis | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/debian/scripts/misc/getabis b/debian/scripts/misc/getabis index b35639c..2e77f23 100755 --- a/debian/scripts/misc/getabis +++ b/debian/scripts/misc/getabis @@ -1,12 +1,14 @@ #!/bin/bash -. debian/debian.env - if [ "$#" != "2" ]; then echo "Usage: $0 " 1>&2 exit 1 fi +if [ "$DEBIAN" = "" ]; then + . debian/debian.env +fi + ver=$1 revision=$2 abi=$(echo $revision | awk -F. '{print $1}') @@ -14,7 +16,7 @@ abi=$(echo $revision | awk -F. '{print $1}') verabi=$ver-$abi verfull=$ver-$revision -WGET="wget --quiet -c" +WGET="wget --tries=1 --timeout=10 --quiet -c" abidir="`pwd`/$DEBIAN/abi/$verfull" tmpdir="`pwd`/abi-tmp-$verfull" @@ -38,7 +40,7 @@ getall() { echo "Exists: $sub" continue fi - echo -n "Fetching $sub..." + echo -n "Fetching $sub($arch)..." prefixes="" filenames="" cd $tmpdir @@ -76,7 +78,8 @@ getall() { $abidir/$arch/$sub.modules ( cd tmp; - ko=`find lib/modules/$verabi-$sub/kernel -name '*.ko' | head -1` + ko=$(find lib/modules/$verabi-$sub/kernel \ + -name '*.ko' | head -1) readelf -p .comment "$ko" | awk ' ($1 == "[") { printf("%s", $3);