From patchwork Fri Oct 4 21:44:45 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: 20841 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f71.google.com (mail-qe0-f71.google.com [209.85.128.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 514D82395E for ; Fri, 4 Oct 2013 21:45:02 +0000 (UTC) Received: by mail-qe0-f71.google.com with SMTP id a11sf9297845qen.2 for ; Fri, 04 Oct 2013 14:45:02 -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:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=COG/aJgg0ctxsMvifUhQR6XdLNVLph987cnfyJ4TTQU=; b=Y+913goYa/TxGMYXUc4/PnqM4ZSDMmk/p56c44JWAC9Eka89b8fOK/crkHZusBLgkB rwlbr6YtWkE4nHNlgsx8baJFE3bdVs/j+RQ9jNp3OU7t3it/hEkHStgOF09ZbSzhCu1Y P188PV+KGqDuQsElQffJWJ67B272EK6aBiNH4j2jAIpLA37hIkmQIc/Xr0jRO2oWdsnI yliXa65C9xcB3/n4vVv77P1xk96Woa8X9Luc5+w+19xKuHPNs7PlH1a8LPko5mVoV292 wDJnaKQxb1LVZmcFcwoEULfoGb/2rPPpF4p9PKoCO+uz9uKZpaYUh81CY8OEAy5fei3s nDZg== X-Received: by 10.236.73.164 with SMTP id v24mr13669945yhd.24.1380923102197; Fri, 04 Oct 2013 14:45:02 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.82.49 with SMTP id f17ls1507576qey.33.gmail; Fri, 04 Oct 2013 14:45:02 -0700 (PDT) X-Received: by 10.52.98.131 with SMTP id ei3mr11857400vdb.4.1380923102105; Fri, 04 Oct 2013 14:45:02 -0700 (PDT) Received: from mail-ve0-f177.google.com (mail-ve0-f177.google.com [209.85.128.177]) by mx.google.com with ESMTPS id tj1si3905088vdc.14.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 14:45:01 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.177 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.177; Received: by mail-ve0-f177.google.com with SMTP id db12so2718960veb.8 for ; Fri, 04 Oct 2013 14:45:01 -0700 (PDT) X-Gm-Message-State: ALoCoQl/Y7ErMgtBZqiKFHjRdxgMgbMbU4RoHIutVULyK5MR04peY91/xUN+M+uepLE81OK+lqb3 X-Received: by 10.220.186.202 with SMTP id ct10mr14326050vcb.14.1380923101785; Fri, 04 Oct 2013 14:45:01 -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 u4csp70598vcz; Fri, 4 Oct 2013 14:45:01 -0700 (PDT) X-Received: by 10.50.66.101 with SMTP id e5mr8356082igt.26.1380923100846; Fri, 04 Oct 2013 14:45:00 -0700 (PDT) Received: from mail-ie0-f170.google.com (mail-ie0-f170.google.com [209.85.223.170]) by mx.google.com with ESMTPS id ih2si2574789icb.58.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 14:45:00 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.223.170 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.223.170; Received: by mail-ie0-f170.google.com with SMTP id x13so10694202ief.1 for ; Fri, 04 Oct 2013 14:45:00 -0700 (PDT) X-Received: by 10.43.62.205 with SMTP id xb13mr10146871icb.20.1380923100257; Fri, 04 Oct 2013 14:45:00 -0700 (PDT) Received: from localhost.net (c-71-195-40-9.hsd1.mn.comcast.net. [71.195.40.9]) by mx.google.com with ESMTPSA id p5sm9551362igj.10.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 04 Oct 2013 14:44:59 -0700 (PDT) From: "Ryan S. Arnold" To: rob.savoye@linaro.org Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH] Fix stamp-configure* name for git repos with specific named branches Date: Fri, 4 Oct 2013 16:44:45 -0500 Message-Id: <1380923085-2705-1-git-send-email-ryan.arnold@linaro.org> X-Mailer: git-send-email 1.8.3.1 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.128.177 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" Similar to the previous patch which fixed this for stamp-build*. --- lib/configure.sh | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/lib/configure.sh b/lib/configure.sh index 4857818..b5d03e9 100755 --- a/lib/configure.sh +++ b/lib/configure.sh @@ -21,11 +21,20 @@ configure_build() local revision="" fi - if test ${local_builds}/${host}/${target}/stamp-configure-$1 -nt ${local_snapshots}/$1 -a x"${force}" = xno; then - fixme "stamp-configure-${file} is newer than $1, so not configuring $1" + # git repositories might have a branch name designated with a slash. + # Change the / to a - in the stamp name, otherwise stamp creation + # will fail because the shell thinks the part before the / is a directory + # name. + local file="`echo ${file} | sed -e 's:/:-:'`" + local stamp="stamp-configure-${file}" + + if test ${local_builds}/${host}/${target}/${stamp} -nt ${local_snapshots}/${file} -a x"${force}" = xno; then + fixme "${stamp} is newer than $1, so not configuring $1" return 0 else - fixme "stamp-configure-${file} is not newer than $1, so configuring $1" + # FIXME: Don't output a message that implies that there is a stamp if + # this is the first time through and one doesn't exist. + fixme "${stamp} is not newer than $1, so configuring $1" fi local srcdir="`get_srcdir $1`" @@ -186,7 +195,7 @@ configure_build() default_configure_flags= fi - touch ${local_builds}/${host}/${target}/stamp-configure-${file} + touch ${local_builds}/${host}/${target}/${stamp} return 0 }