| Message ID | 20180402081434.4411-12-maxime.hadjinlian@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v4,01/13] core/pkg-download: change all helpers to use common options | expand |
Maxime, All, On 2018-04-02 10:14 +0200, Maxime Hadjinlian spake thusly: > In order to introduce the cache mechanisms, we need to have a lock on > the $(LIBFOO_DL_DIR), otherwise it would be impossible to do parallel > download (a shared DL_DIR for two buildroot instances). > > To make sure the directory exists, the mkdir call has been removed from > the dl-wrapper and put in the infrastructure. This sentence now is no longer needed, bevause the move jas already been done in a previous patch... Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Regards, Yann E. MORIN. > Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> > --- > package/pkg-download.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/package/pkg-download.mk b/package/pkg-download.mk > index 54edbae29a..05842bd430 100644 > --- a/package/pkg-download.mk > +++ b/package/pkg-download.mk > @@ -19,6 +19,7 @@ SSH := $(call qstrip,$(BR2_SSH)) > export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) > > DL_WRAPPER = support/download/dl-wrapper > +FLOCK = flock $($(PKG)_DL_DIR)/ > > # DL_DIR may have been set already from the environment > ifeq ($(origin DL_DIR),undefined) > @@ -92,7 +93,7 @@ endif > define DOWNLOAD > $(Q)mkdir -p $($(PKG)_DL_DIR)/ > $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),BR_NO_CHECK_HASH_FOR=$(notdir $(1))) \ > - $(EXTRA_ENV) $(DL_WRAPPER) \ > + $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ > -c $($(PKG)_DL_VERSION) \ > -f $(notdir $(1)) \ > -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \ > -- > 2.16.2 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/pkg-download.mk b/package/pkg-download.mk index 54edbae29a..05842bd430 100644 --- a/package/pkg-download.mk +++ b/package/pkg-download.mk @@ -19,6 +19,7 @@ SSH := $(call qstrip,$(BR2_SSH)) export LOCALFILES := $(call qstrip,$(BR2_LOCALFILES)) DL_WRAPPER = support/download/dl-wrapper +FLOCK = flock $($(PKG)_DL_DIR)/ # DL_DIR may have been set already from the environment ifeq ($(origin DL_DIR),undefined) @@ -92,7 +93,7 @@ endif define DOWNLOAD $(Q)mkdir -p $($(PKG)_DL_DIR)/ $(Q)$(if $(filter bzr cvs hg svn,$($(PKG)_SITE_METHOD)),BR_NO_CHECK_HASH_FOR=$(notdir $(1))) \ - $(EXTRA_ENV) $(DL_WRAPPER) \ + $(EXTRA_ENV) $(FLOCK) $(DL_WRAPPER) \ -c $($(PKG)_DL_VERSION) \ -f $(notdir $(1)) \ -H $(PKGDIR)/$($(PKG)_RAWNAME).hash \
In order to introduce the cache mechanisms, we need to have a lock on the $(LIBFOO_DL_DIR), otherwise it would be impossible to do parallel download (a shared DL_DIR for two buildroot instances). To make sure the directory exists, the mkdir call has been removed from the dl-wrapper and put in the infrastructure. Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> --- package/pkg-download.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)