| Message ID | 43af74b1eef19b5f6b5354e5fcd0b0dbf049f7e6.1404167061.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
Yann, On Mon, Jun 30, 2014 at 5:26 PM, Yann E. MORIN <yann.morin.1998@free.fr> wrote: > Maintaining the download helpers in the Makefile has proved to be a bit > complex, so move it to a shell script. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Reviewed-by: Samuel Martin <s.martin49@gmail.com> > --- > package/pkg-download.mk | 9 +++------ > support/download/svn | 25 +++++++++++++++++++++++++ > 2 files changed, 28 insertions(+), 6 deletions(-) > create mode 100755 support/download/svn > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index c848f6a..e823f68 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -9,7 +9,7 @@ > > # Download method commands > WGET := $(call qstrip,$(BR2_WGET)) $(QUIET) > -SVN := $(call qstrip,$(BR2_SVN)) > +export SVN := $(call qstrip,$(BR2_SVN)) > CVS := $(call qstrip,$(BR2_CVS)) > BZR := $(call qstrip,$(BR2_BZR)) > export GIT := $(call qstrip,$(BR2_GIT)) > @@ -133,11 +133,8 @@ endef > > define DOWNLOAD_SVN > test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ > - (pushd $(DL_DIR) > /dev/null && \ > - $(SVN) export $($(PKG)_SITE)@$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) && \ > - $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \ > - rm -rf $($(PKG)_DL_DIR) && \ > - popd > /dev/null) > + $(EXTRA_ENV) support/download/svn $($(PKG)_SITE) $($(PKG)_DL_VERSION) \ > + $($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE) > endef > > define SOURCE_CHECK_SVN > diff --git a/support/download/svn b/support/download/svn > new file mode 100755 > index 0000000..717fad3 > --- /dev/null > +++ b/support/download/svn > @@ -0,0 +1,25 @@ > +#!/bin/sh > + > +# We want to catch any command failure, and exit immediately > +set -e > + > +# Download helper for svn > +# Call it with: > +# $1: svn repo > +# $2: svn revision > +# $3: package's basename (eg. foobar-1.2.3) > +# $4: output file > +# And this environment: > +# SVN : the svn command to call > +# BR2_DL_DIR: path to Buildroot's download dir > + > +repo="${1}" > +rev="${2}" > +basename="${3}" > +output="${4}" > + > +pushd "${BR2_DL_DIR}" > +${SVN} export "${repo}@${rev}" "${basename}" Glad to see you incorporated this change! > +tar czf "${output}" "${basename}" > +rm -rf "${basename}" > +popd Reviewed-by: Ryan Barnett <ryan.barnett@rockwellcollins.com>
diff --git a/package/pkg-download.mk b/package/pkg-download.mk index c848f6a..e823f68 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -9,7 +9,7 @@ # Download method commands WGET := $(call qstrip,$(BR2_WGET)) $(QUIET) -SVN := $(call qstrip,$(BR2_SVN)) +export SVN := $(call qstrip,$(BR2_SVN)) CVS := $(call qstrip,$(BR2_CVS)) BZR := $(call qstrip,$(BR2_BZR)) export GIT := $(call qstrip,$(BR2_GIT)) @@ -133,11 +133,8 @@ endef define DOWNLOAD_SVN test -e $(DL_DIR)/$($(PKG)_SOURCE) || \ - (pushd $(DL_DIR) > /dev/null && \ - $(SVN) export $($(PKG)_SITE)@$($(PKG)_DL_VERSION) $($(PKG)_DL_DIR) && \ - $(TAR) czf $($(PKG)_SOURCE) $($(PKG)_BASE_NAME)/ && \ - rm -rf $($(PKG)_DL_DIR) && \ - popd > /dev/null) + $(EXTRA_ENV) support/download/svn $($(PKG)_SITE) $($(PKG)_DL_VERSION) \ + $($(PKG)_BASE_NAME) $(DL_DIR)/$($(PKG)_SOURCE) endef define SOURCE_CHECK_SVN diff --git a/support/download/svn b/support/download/svn new file mode 100755 index 0000000..717fad3 --- /dev/null +++ b/support/download/svn @@ -0,0 +1,25 @@ +#!/bin/sh + +# We want to catch any command failure, and exit immediately +set -e + +# Download helper for svn +# Call it with: +# $1: svn repo +# $2: svn revision +# $3: package's basename (eg. foobar-1.2.3) +# $4: output file +# And this environment: +# SVN : the svn command to call +# BR2_DL_DIR: path to Buildroot's download dir + +repo="${1}" +rev="${2}" +basename="${3}" +output="${4}" + +pushd "${BR2_DL_DIR}" +${SVN} export "${repo}@${rev}" "${basename}" +tar czf "${output}" "${basename}" +rm -rf "${basename}" +popd