From patchwork Sun Jul 20 22:42:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 371948 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id B49FD14010F for ; Mon, 21 Jul 2014 08:43:04 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D5CF9316C1; Sun, 20 Jul 2014 22:43:03 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hSy6JX9iCVUp; Sun, 20 Jul 2014 22:42:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E85E131A4D; Sun, 20 Jul 2014 22:42:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id E51461BFA7F for ; Sun, 20 Jul 2014 22:42:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B23C73162B for ; Sun, 20 Jul 2014 22:42:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MNuPsuPKlT-w for ; Sun, 20 Jul 2014 22:42:36 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f45.google.com (mail-wg0-f45.google.com [74.125.82.45]) by silver.osuosl.org (Postfix) with ESMTPS id 195C830AED for ; Sun, 20 Jul 2014 22:42:35 +0000 (UTC) Received: by mail-wg0-f45.google.com with SMTP id x12so5559089wgg.28 for ; Sun, 20 Jul 2014 15:42:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=+03+yIkjIChhZuzdDyy0tBGrArIYjZyv4EzCGtRQljQ=; b=KJ0B79p0EVamLm0lBBQfGGhKjlE+2b4SUgY/AU1ZfslPYR8I1SyHju7ssLkm3PnKny 5b+i0P4BMxYqdYsovVmR3LItKbsQ6XFKoSe6lm1oVSlfdexOZUMhr6umzZhRy6AUpy2u nh70op50JdE6f65XHZz6zxw6KFweKKSoBJHhafzPtDlTsr+wLUA/7irNopWl0zPC8vWO X/6ERdLwi19lVl+hxCGWoCkNQuj/G9E43WAvBNZhepLA1Mtb6QC9rZXwD2F57DfM82CN ztxEwUZ2IkX4B+NUe4d6hiCaCHLWMNIyALokxTZxFlfGTIRam8khdGHto8RdEEzEjjBG CiBQ== X-Received: by 10.194.121.6 with SMTP id lg6mr17170613wjb.116.1405896154551; Sun, 20 Jul 2014 15:42:34 -0700 (PDT) Received: from gourin.bzh.lan (ks3095497.kimsufi.com. [94.23.60.27]) by mx.google.com with ESMTPSA id ft17sm32902084wjc.14.2014.07.20.15.42.33 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 20 Jul 2014 15:42:33 -0700 (PDT) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Mon, 21 Jul 2014 00:42:23 +0200 Message-Id: <7cc8bbdb9b1d15e060efb134edd6d3cce62e69a6.1405895896.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 1.9.1 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 5/9 v3] support/download: convert git to use the wrapper X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net This drastically simplifies the git helper, as it no longer has to deal with atomically saving the downloaded archive. Signed-off-by: "Yann E. MORIN" Tested-by: Thomas De Schampheleire --- package/pkg-download.mk | 7 ++++-- support/download/git | 58 +++++++++++++++---------------------------------- 2 files changed, 23 insertions(+), 42 deletions(-) diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 235adcb..696ff3e 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -95,8 +95,11 @@ endef # problems define DOWNLOAD_GIT test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ - $(EXTRA_ENV) support/download/git $($(PKG)_SITE) $($(PKG)_DL_VERSION) \ - $($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE) + $(EXTRA_ENV) support/download/wrapper git \ + $(DL_DIR)/$($(PKG)_SOURCE) \ + $($(PKG)_SITE) \ + $($(PKG)_DL_VERSION) \ + $($(PKG)_BASE_NAME) endef # TODO: improve to check that the given PKG_DL_VERSION exists on the remote diff --git a/support/download/git b/support/download/git index 116e5a9..8d9505d 100755 --- a/support/download/git +++ b/support/download/git @@ -1,60 +1,38 @@ #!/bin/bash -# We want to catch any command failure, and exit immediately +# We want to catch any unexpected failure, and exit immediately set -e # Download helper for git # Call it with: -# $1: git repo -# $2: git cset -# $3: package's basename (eg. foobar-1.2.3) -# $4: output file +# $1: output file +# $2: git repo +# $3: git cset +# $4: package's basename (eg. foobar-1.2.3) # And this environment: # GIT : the git command to call -# BUILD_DIR: path to Buildroot's build dir -repo="${1}" -cset="${2}" -basename="${3}" -output="${4}" +output="${1}" +repo="${2}" +cset="${3}" +basename="${4}" -repodir="${basename}.tmp-git-checkout" -tmp_tar="$( mktemp "${BUILD_DIR}/.XXXXXX" )" -tmp_output="$( mktemp "${output}.XXXXXX" )" - -# Play tic-tac-toe with temp files -# - first, we download to a trashable location (the build-dir) -# - then we create the uncomporessed tarball in tht same trashable location -# - then we create a temporary compressed tarball in the final location, so -# it is on the same filesystem as the final file -# - finally, we atomically rename to the final file - -cd "${BUILD_DIR}" -# Remove leftovers from a previous failed run -rm -rf "${repodir}" - -git_done=0 +# Try to see if we can do a shallow clone, since it is faster +# than a full clone. if [ -n "$(${GIT} ls-remote "${repo}" "${cset}" 2>&1)" ]; then printf "Doing shallow clone\n" - if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${repodir}"; then + if ${GIT} clone --depth 1 -b "${cset}" --bare "${repo}" "${basename}"; then git_done=1 + else + printf "Shallow clone failed, falling back to doing a full clone\n" fi fi if [ ${git_done} -eq 0 ]; then printf "Doing full clone\n" - ${GIT} clone --bare "${repo}" "${repodir}" + ${GIT} clone --bare "${repo}" "${basename}" fi -ret=1 -pushd "${repodir}" >/dev/null -if ${GIT} archive --prefix="${basename}/" -o "${tmp_tar}" \ - --format=tar "${cset}"; then - if gzip -c "${tmp_tar}" >"${tmp_output}"; then - mv "${tmp_output}" "${output}" - ret=0 - fi -fi -popd >/dev/null +GIT_DIR="${basename}" \ +${GIT} archive --prefix="${basename}/" -o "${output}" --format=tar "${cset}" -rm -rf "${repodir}" "${tmp_tar}" "${tmp_output}" -exit ${ret} +gzip "${output}"