| Message ID | 049c6d8a781651f1ad91d9e76554c572fc5d63a9.1461881416.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
On 04/29/16 00:27, Yann E. MORIN wrote: > .. and use $(Q) instead of a hard-coded @. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Luca Ceresoli <luca@lucaceresoli.net> > > --- > Changes v5 -> v6: > - directly call the helper script (Thomas, Arnout) > - drop Luca's and Arnout's tags, as the code did change a bit > > Changes v4 -> v5: > - s/Copy/Save/ because we're not really copying > > Changes v2 -> v3: > - comment the @ -> $(Q) change (Arnout) > --- > package/pkg-generic.mk | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index 3904c09..5c2e46d 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -803,9 +803,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) > ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_SOURCE)) > $$(call DOWNLOAD,$$($(2)_ACTUAL_SOURCE_SITE)/$$($(2)_ACTUAL_SOURCE_TARBALL)) > endif > -# Copy the source tarball (just hardlink if possible) > - @cp -l $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL) $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) 2>/dev/null || \ > - cp $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL) $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) > +# Save the source tarball > + $$(Q)$$(HARDLINK_OR_COPY) $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL),\ Did you test this? I don't think it can work with that comma... Ah, but it gets fixed in patch 6 :-) Regards, Arnout > + $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) > endif # redistribute > > endif # other packages >
Arnout, All, On 2016-05-04 00:57 +0200, Arnout Vandecappelle spake thusly: > On 04/29/16 00:27, Yann E. MORIN wrote: > >.. and use $(Q) instead of a hard-coded @. > > > >Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > >Cc: Luca Ceresoli <luca@lucaceresoli.net> > > > >--- > >Changes v5 -> v6: > > - directly call the helper script (Thomas, Arnout) > > - drop Luca's and Arnout's tags, as the code did change a bit > > > >Changes v4 -> v5: > > - s/Copy/Save/ because we're not really copying > > > >Changes v2 -> v3: > > - comment the @ -> $(Q) change (Arnout) > >--- > > package/pkg-generic.mk | 6 +++--- > > 1 file changed, 3 insertions(+), 3 deletions(-) > > > >diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > >index 3904c09..5c2e46d 100644 > >--- a/package/pkg-generic.mk > >+++ b/package/pkg-generic.mk > >@@ -803,9 +803,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) > > ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_SOURCE)) > > $$(call DOWNLOAD,$$($(2)_ACTUAL_SOURCE_SITE)/$$($(2)_ACTUAL_SOURCE_TARBALL)) > > endif > >-# Copy the source tarball (just hardlink if possible) > >- @cp -l $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL) $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) 2>/dev/null || \ > >- cp $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL) $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) > >+# Save the source tarball > >+ $$(Q)$$(HARDLINK_OR_COPY) $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL),\ > > Did you test this? I don't think it can work with that comma... Wooppsss... :-/ > Ah, but it gets fixed in patch 6 :-) Re-wooppsss... :-/ Thanks! :-) Regards, Yann E. MORIN. > Regards, > Arnout > > >+ $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) > > endif # redistribute > > > > endif # other packages > > > > > -- > Arnout Vandecappelle arnout at mind be > Senior Embedded Software Architect +32-16-286500 > Essensium/Mind http://www.mind.be > G.Geenslaan 9, 3001 Leuven, Belgium BE 872 984 063 RPR Leuven > LinkedIn profile: http://www.linkedin.com/in/arnoutvandecappelle > GPG fingerprint: 7493 020B C7E3 8618 8DEC 222C 82EB F404 F9AC 0DDF
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 3904c09..5c2e46d 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -803,9 +803,9 @@ ifeq ($$($(2)_REDISTRIBUTE),YES) ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_SOURCE)) $$(call DOWNLOAD,$$($(2)_ACTUAL_SOURCE_SITE)/$$($(2)_ACTUAL_SOURCE_TARBALL)) endif -# Copy the source tarball (just hardlink if possible) - @cp -l $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL) $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) 2>/dev/null || \ - cp $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL) $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) +# Save the source tarball + $$(Q)$$(HARDLINK_OR_COPY) $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL),\ + $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4))) endif # redistribute endif # other packages
.. and use $(Q) instead of a hard-coded @. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Luca Ceresoli <luca@lucaceresoli.net> --- Changes v5 -> v6: - directly call the helper script (Thomas, Arnout) - drop Luca's and Arnout's tags, as the code did change a bit Changes v4 -> v5: - s/Copy/Save/ because we're not really copying Changes v2 -> v3: - comment the @ -> $(Q) change (Arnout) --- package/pkg-generic.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)