From patchwork Thu Oct 10 16:40:13 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Ryan S. Arnold" X-Patchwork-Id: 20946 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id CF82425C9D for ; Thu, 10 Oct 2013 16:40:53 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id vb8sf12022203obc.2 for ; Thu, 10 Oct 2013 09:40:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=3R29j1KSJk5msAs5pVrccluH5ku6ctLAN+Tsywe7cEk=; b=dfJrVr9Nu07ix33tQLBv8tBVD0oRu3n+kv77Ckd73qfAzCtwvnwFtR1OQRhrKz6vEc E9po/y2vVvj27d+NdO2c2yq1MjVS0Mbf0a+0M7XovRzmx0DuRohibpQp3I6WhXTgglHf XpoHNLhLqLIjoPRNRWuW9t0ovNymJQFrNHJOncRvVhIP+GY/FVsouhvqciHewJ6cbgnB jvKx0jZ4d6uMRIjAlkNbEWummrUuagZiGFcpC23N+z2xEjKTS4Yu68ApRl8YNVvnNxXC EXFY7XimxrsjbtBSRnslxGlBqT8q7MIEtHRa4EBo22U/eIVwSBIlrsGLnVj4QhWYrD+L E80A== X-Received: by 10.182.205.138 with SMTP id lg10mr4291903obc.33.1381423253219; Thu, 10 Oct 2013 09:40:53 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.104.177 with SMTP id gf17ls1082441qeb.4.gmail; Thu, 10 Oct 2013 09:40:53 -0700 (PDT) X-Received: by 10.220.145.132 with SMTP id d4mr15415350vcv.9.1381423253082; Thu, 10 Oct 2013 09:40:53 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id sc5si14583348vdc.9.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 09:40:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id id10so1363771vcb.12 for ; Thu, 10 Oct 2013 09:40:53 -0700 (PDT) X-Gm-Message-State: ALoCoQmKgx1pRQr43d71VLVulJNrEb3eGuLpSNB22pXMDYtSN4gh7UWNujft2yIR4jZ8ScVscjPT X-Received: by 10.220.50.10 with SMTP id x10mr8530942vcf.86.1381423252955; Thu, 10 Oct 2013 09:40:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp391027vcz; Thu, 10 Oct 2013 09:40:52 -0700 (PDT) X-Received: by 10.42.69.204 with SMTP id c12mr586999icj.106.1381423251847; Thu, 10 Oct 2013 09:40:51 -0700 (PDT) Received: from mail-ie0-f182.google.com (mail-ie0-f182.google.com [209.85.223.182]) by mx.google.com with ESMTPS id jb1si236727icb.122.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 10 Oct 2013 09:40:51 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.223.182 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.223.182; Received: by mail-ie0-f182.google.com with SMTP id as1so4409994iec.41 for ; Thu, 10 Oct 2013 09:40:51 -0700 (PDT) X-Received: by 10.50.25.129 with SMTP id c1mr7257693igg.23.1381423250987; Thu, 10 Oct 2013 09:40:50 -0700 (PDT) Received: from badwing.hsd1.mn.comcast.net. (c-71-195-40-9.hsd1.mn.comcast.net. [71.195.40.9]) by mx.google.com with ESMTPSA id ka5sm14021465igb.2.1969.12.31.16.00.00 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Thu, 10 Oct 2013 09:40:50 -0700 (PDT) From: "Ryan S. Arnold" To: Rob Savoye Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH][cbuild2 1/4] Remove unneeded infrastructure/md5sums fragment from scripts. Date: Thu, 10 Oct 2013 11:40:13 -0500 Message-Id: <1381423216-21180-2-git-send-email-ryan.arnold@linaro.org> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1381423216-21180-1-git-send-email-ryan.arnold@linaro.org> References: <1381423216-21180-1-git-send-email-ryan.arnold@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ryan.arnold@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: "Ryan S. Arnold" The file, snapshots/md5sums, has the infrastructure md5sums entries in it already so the infrastructure/ specific md5sums file is redundant. --- cbuild2.sh | 2 +- lib/depend.sh | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/cbuild2.sh b/cbuild2.sh index 964efea..e4ce56d 100755 --- a/cbuild2.sh +++ b/cbuild2.sh @@ -40,7 +40,7 @@ get_list() echo "${snapshots}" ;; infrastructure|i*) - infrastructure="`grep infrastructure ${local_snapshots}/infrastructure/md5sums | cut -d ' ' -f 3 | cut -d '/' -f 2`" + infrastructure="`grep infrastructure ${local_snapshots}/md5sums | cut -d ' ' -f 3 | cut -d '/' -f 2`" echo "${infrastructure}" ;; esac diff --git a/lib/depend.sh b/lib/depend.sh index cd326ce..847ede2 100755 --- a/lib/depend.sh +++ b/lib/depend.sh @@ -158,8 +158,6 @@ infrastructure() { trace "$*" - rm -f ${local_snapshots}/infrastructure/md5sums - fetch_http infrastructure/md5sums rm -f ${local_snapshots}/infrastructure/ChangeLog fetch_http infrastructure/ChangeLog @@ -169,7 +167,13 @@ infrastructure() error "No dependencies listed for infrastructure libraries!" return 1 fi - + + # This shouldn't happen, but it's nice for regression verification. + if test ! -e ${local_snapshots}/md5sums; then + error "Missing ${local_snapshots}/md5sums file needed for infrastructure libraries." + return 1 + fi + # We have to grep each dependency separately to preserve the order, as # some libraries depend on other libraries being bult first. Egrep # unfortunately sorts the files, which screws up the order.