From patchwork Fri Oct 4 18:57:46 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: 20834 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f69.google.com (mail-vb0-f69.google.com [209.85.212.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A1D2825E85 for ; Fri, 4 Oct 2013 18:58:09 +0000 (UTC) Received: by mail-vb0-f69.google.com with SMTP id e13sf8248270vbg.4 for ; Fri, 04 Oct 2013 11:58:09 -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=wzQeOh8JS4EaeMEO4dgTyV69/6xaIGnUCWS64xMc2A0=; b=j7WtIITLKq8HdtAmB8XHzyGqfVid8DgurNapMGVtwLwJc2jKWxnfFB538hf+MOBNpJ +XC/gRWlusrfMKAyJB3YpAIbL2IoGxHujRszAed32ShTpkOk1E10eAoaW/K9HixkZ9ZO Nz+NnzuAcFtaUz0M2EdjlAOxAlVbYdeA8w2Cd8jHOsgzkdbSEOKjk/HKVbG4aSaDKoxX 98A6ASzeqNWHwmmWUx7V0Bo+52N4JQ6YLnP/MlmWMSHbkotuckd9KxW8sBGwOOongrKj DqZM6zPJcnib8synbbe/5d4Ncmgo0A2Yo6Pg7ihOp9wmxmMuSQjZV3dx0ZupwYLWoG/s Yp0w== X-Received: by 10.236.69.35 with SMTP id m23mr13427361yhd.6.1380913089440; Fri, 04 Oct 2013 11:58:09 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.50.225 with SMTP id f1ls1387634qeo.66.gmail; Fri, 04 Oct 2013 11:58:09 -0700 (PDT) X-Received: by 10.220.184.70 with SMTP id cj6mr2004113vcb.23.1380913089332; Fri, 04 Oct 2013 11:58:09 -0700 (PDT) Received: from mail-vc0-f172.google.com (mail-vc0-f172.google.com [209.85.220.172]) by mx.google.com with ESMTPS id tj1si3689106vdc.105.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 11:58:09 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.172 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.172; Received: by mail-vc0-f172.google.com with SMTP id hu8so1909286vcb.17 for ; Fri, 04 Oct 2013 11:58:09 -0700 (PDT) X-Gm-Message-State: ALoCoQn8z4jdLcASdH6bXTccvoD7okDwzNoUEHcwJat6QsfI+vO+wjhKNMqu8JdEUrC4MUtbkcNW X-Received: by 10.220.94.206 with SMTP id a14mr2733354vcn.19.1380913089064; Fri, 04 Oct 2013 11:58:09 -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 u4csp62088vcz; Fri, 4 Oct 2013 11:58:08 -0700 (PDT) X-Received: by 10.43.130.2 with SMTP id hk2mr9786496icc.11.1380913088313; Fri, 04 Oct 2013 11:58:08 -0700 (PDT) Received: from mail-ie0-f174.google.com (mail-ie0-f174.google.com [209.85.223.174]) by mx.google.com with ESMTPS id nv2si1128429icc.46.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 04 Oct 2013 11:58:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.223.174 is neither permitted nor denied by best guess record for domain of ryan.arnold@linaro.org) client-ip=209.85.223.174; Received: by mail-ie0-f174.google.com with SMTP id u16so10066856iet.33 for ; Fri, 04 Oct 2013 11:58:07 -0700 (PDT) X-Received: by 10.42.54.132 with SMTP id r4mr9745527icg.19.1380913087777; Fri, 04 Oct 2013 11:58:07 -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 x6sm8626512igb.3.1969.12.31.16.00.00 (version=TLSv1.2 cipher=AES128-GCM-SHA256 bits=128/128); Fri, 04 Oct 2013 11:58:07 -0700 (PDT) From: "Ryan S. Arnold" To: rob.savoye@linaro.org Cc: patches@linaro.org, "Ryan S. Arnold" Subject: [PATCH] Fix stamp name for git repos with specific named branches. Date: Fri, 4 Oct 2013 13:57:46 -0500 Message-Id: <1380913066-26784-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.220.172 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" 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. --- lib/make.sh | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/lib/make.sh b/lib/make.sh index 19b8f7d..15f5082 100755 --- a/lib/make.sh +++ b/lib/make.sh @@ -113,12 +113,19 @@ build() # fi local tag="${url}${branch}${revision}" + # 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 stamp="`echo ${file} | sed -e 's:/:-:'`" + local stamp="stamp-build-${stamp}${2:+-$2}" + # If the tarball hasn't changed, then don't fetch anything - if test ${local_builds}/${host}/${target}/stamp-build-${file}$2 -nt ${local_snapshots}/${url} -a x"${force}" = xno -a x"$2" != x"stage2"; then - fixme "stamp-build-${file} is newer than ${url}, so not building ${file}" + if test ${local_builds}/${host}/${target}/${stamp} -nt ${local_snapshots}/${url} -a x"${force}" = xno -a x"$2" != x"stage2"; then + fixme "${stamp} is newer than ${url}, so not building ${file}" return 0 else - fixme "stamp-build-${file} is not newer than ${url}, so building ${file}" + fixme "${stamp} is not newer than ${url}, so building ${file}" fi notice "Building ${tag}" @@ -212,7 +219,7 @@ build() fi fi - touch ${local_builds}/${host}/${target}/stamp-build-${file}$2 + touch ${local_builds}/${host}/${target}/${stamp} notice "Done building ${tag}..." # For cross testing, we need to build a C library with our freshly built