From patchwork Sun Nov 9 09:49:03 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 40526 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 3187E203C0 for ; Mon, 10 Nov 2014 19:11:59 +0000 (UTC) Received: by mail-la0-f69.google.com with SMTP id q1sf5561860lam.0 for ; Mon, 10 Nov 2014 11:11:58 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :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=sS0bolsXM6aNBDq83hJXCByrPQIGov1Xa2kGhU/1cSk=; b=CtdRpFKGdnDqKFpRV2GkwLNLtcnWqTv6svZwhUkImVTmNTKwrcaDcqhOXiAlbxEA76 nBIsMnkxdBMpBKDTgH+BZXWZC0o7uw6jSq6LxFTzxmfdVTBpKOq6kP8rJPZ8kPPhAsJy j9i+kzoZq/MyeQB/HnGoq/oSIl8Ana1sV4fREUST9GbvH6HyjX/1CAVjIX2fdkIcuKyp SAts+cfiIxiH2EVllHKg+x5G4U2tbfkHtkNuXwjtp59LVSTtn1NwzP9A/22DiVfr+j0M VdXLtfPPPuFXxYmAws2JYV1RjC7Y/TSTC8AckDvyhqWZ9A2SVIqMPt/PpoEwJTvrQHUc MZTA== X-Gm-Message-State: ALoCoQkRBiAkGCSWYpElGtCKlaeaIK69ijktCouD3/k0PlJZxPThWQw6DnOrSw5buqV6Ut4WUWqa X-Received: by 10.152.36.135 with SMTP id q7mr16827laj.8.1415646717877; Mon, 10 Nov 2014 11:11:57 -0800 (PST) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.7.177 with SMTP id k17ls435893laa.56.gmail; Mon, 10 Nov 2014 11:11:57 -0800 (PST) X-Received: by 10.112.12.35 with SMTP id v3mr4748522lbb.80.1415646717595; Mon, 10 Nov 2014 11:11:57 -0800 (PST) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id p9si28554695lal.21.2014.11.10.11.11.57 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 10 Nov 2014 11:11:57 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by mail-la0-f45.google.com with SMTP id pn19so8340831lab.18 for ; Mon, 10 Nov 2014 11:11:57 -0800 (PST) X-Received: by 10.112.12.35 with SMTP id v3mr4748492lbb.80.1415646717405; Mon, 10 Nov 2014 11:11:57 -0800 (PST) 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.112.184.201 with SMTP id ew9csp146808lbc; Mon, 10 Nov 2014 11:11:56 -0800 (PST) X-Received: by 10.107.17.230 with SMTP id 99mr4481145ior.78.1415646716059; Mon, 10 Nov 2014 11:11:56 -0800 (PST) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id n4si1800274icp.70.2014.11.10.11.11.55 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 10 Nov 2014 11:11:56 -0800 (PST) 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 1XnP7R-0003FX-3H; Sun, 09 Nov 2014 09:49:13 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XnP7Q-0003FJ-4a for xen-devel@lists.xen.org; Sun, 09 Nov 2014 09:49:12 +0000 Received: from [85.158.137.68] by server-7.bemta-3.messagelabs.com id 50/06-17958-7983F545; Sun, 09 Nov 2014 09:49:11 +0000 X-Env-Sender: Ian.Campbell@citrix.com X-Msg-Ref: server-3.tower-31.messagelabs.com!1415526549!11406239!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.12.4; banners=-,-,- X-VirusChecked: Checked Received: (qmail 14967 invoked from network); 9 Nov 2014 09:49:10 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-3.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 9 Nov 2014 09:49:10 -0000 X-IronPort-AV: E=Sophos;i="5.07,345,1413244800"; d="scan'208";a="189517313" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.79) with Microsoft SMTP Server id 14.3.181.6; Sun, 9 Nov 2014 04:49:03 -0500 Received: from kazak.uk.xensource.com ([10.80.2.80] helo=zakaz.uk.xensource.com) by ukmail1.uk.xensource.com with smtp (Exim 4.69) (envelope-from ) id 1XnP7H-0007Rl-37; Sun, 09 Nov 2014 09:49:04 +0000 Received: by zakaz.uk.xensource.com (sSMTP sendmail emulation); Sun, 09 Nov 2014 09:49:03 +0000 From: Ian Campbell To: Date: Sun, 9 Nov 2014 09:49:03 +0000 Message-ID: <1415526543-3465-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 2.1.1 MIME-Version: 1.0 X-DLP: MIA2 Cc: Ian Campbell , xen-devel@lists.xen.org Subject: [Xen-devel] [PATCH OSSTEST] mg-debian-installer-update: Use Packages.gz 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=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) 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: In Jessie Packages.bz2 is replaced by Packages.xz. Rather than implementing per-suite handling just fallback to lowest-common-denominator gzip. Signed-off-by: Ian Campbell --- mg-debian-installer-update | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/mg-debian-installer-update b/mg-debian-installer-update index 4af4a42..3ae50fb 100755 --- a/mg-debian-installer-update +++ b/mg-debian-installer-update @@ -49,7 +49,7 @@ case ${suite}_${arch} in ;; esac -pfile=$sbase/non-free/binary-$arch/Packages.bz2 +pfile=$sbase/non-free/binary-$arch/Packages.gz dstroot=`getconfig TftpPath`/`getconfig TftpDiBase`/ date=`date +%Y-%m-%d`-$suite @@ -66,12 +66,12 @@ for f in $files; do curl -s $src/$s >$d.new done -curl -s $pfile >Packages.bz2 +curl -s $pfile >Packages.gz for p in $packages; do set +e echo >&2 "collecting $p" - pkgfile=`bzcat Packages.bz2 | grep-dctrl -PX $p -nsFilename` + pkgfile=`zcat Packages.gz | grep-dctrl -PX $p -nsFilename` rc=$? set -e if [ $rc != 0 ]; then fail "package $p not found"; fi @@ -89,13 +89,13 @@ done # wheezy-backports. if [ $arch = armhf ]; then bp="$sbase-backports" - pfile=$bp/main/binary-armhf/Packages.bz2 + pfile=$bp/main/binary-armhf/Packages.gz - curl -s $pfile >Packages.bz2 + curl -s $pfile >Packages.gz # 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 -r | head -n1` + pkgfile=`zcat Packages.gz | 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 @@ -105,7 +105,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 -r | head -n1` + pkgfile=`zcat Packages.gz | 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 @@ -150,7 +150,7 @@ for f in $files; do mv -f $d.new $d done -rm Packages.bz2 +rm Packages.gz #cd $dstroot/$arch #rm -rf current.new