| Message ID | 97333826d04c0cf0b6696c44ab2d8d79d1bfca75.1450031251.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
Dear Yann, Yann E. MORIN wrote: > Some packages, like perl, download extra files that end up as part of > the source that Biuldroot builds. Up until now, those files were not Biuldroot -> Buildroot > saved in the legal-info output. > > Add those files to the legal-info output. > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Luca Ceresoli <luca@lucaceresoli.net> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > > --- > The unfortnate side-effect is that we will also save the secondary > archive for the external blackfin toolchains; however, we already to > save the binary release of some external toolchains when they do not > provide actual source archives. For legal-info, saving one more file is better than missing one. At least if it's an external toolchain that anybody can anyway download from the Internet. So I agree with your choice. > > This is inherently bad, but solving this is a bigger concern, for > another series... Agreed. > --- > package/pkg-generic.mk | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk > index f873e9c..7468e54 100644 > --- a/package/pkg-generic.mk > +++ b/package/pkg-generic.mk > @@ -821,10 +821,13 @@ else > # Other packages > > ifeq ($$($(2)_REDISTRIBUTE),YES) > -# Copy the source tarball > - $$(Q)$$(call hardlink-copy,\ > - $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL),\ > - $$($(2)_REDIST_SOURCES_DIR)) > +# Copy the source tarball and eny extra downloads, but not eny -> any > +# patches, as they are handled specially afterwards. > + $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ > + $$(Q)$$(call hardlink-copy,\ > + $$(DL_DIR)/$$(e),\ > + $$($(2)_REDIST_SOURCES_DIR))$$(sep)) And -legal-info depends on .stamp_downloaded which fetches the extra_downloads, so here we shouldn't have the problem noticed in patch 4. > +# Copy patches and generate the series file Not strictly related to this patch, this line should be in patch 9 ("core/legal-info: also save patches"). Anyway the code looks good, and it's a rather small diff, so: Reviewed-by: Luca Ceresoli <luca@lucaceresoli.net>
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index f873e9c..7468e54 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -821,10 +821,13 @@ else # Other packages ifeq ($$($(2)_REDISTRIBUTE),YES) -# Copy the source tarball - $$(Q)$$(call hardlink-copy,\ - $$(DL_DIR)/$$($(2)_ACTUAL_SOURCE_TARBALL),\ - $$($(2)_REDIST_SOURCES_DIR)) +# Copy the source tarball and eny extra downloads, but not +# patches, as they are handled specially afterwards. + $$(foreach e,$$($(2)_ACTUAL_SOURCE_TARBALL) $$(notdir $$($(2)_EXTRA_DOWNLOADS)),\ + $$(Q)$$(call hardlink-copy,\ + $$(DL_DIR)/$$(e),\ + $$($(2)_REDIST_SOURCES_DIR))$$(sep)) +# Copy patches and generate the series file $$(Q)while read f; do \ $$(call hardlink-copy,$$$${f},$$($(2)_REDIST_SOURCES_DIR)) || exit 1; \ printf "%s\n" "$$$${f##*/}" >>$$($(2)_REDIST_SOURCES_DIR)/series || exit 1; \
Some packages, like perl, download extra files that end up as part of the source that Biuldroot builds. Up until now, those files were not saved in the legal-info output. Add those files to the legal-info output. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Luca Ceresoli <luca@lucaceresoli.net> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> --- The unfortnate side-effect is that we will also save the secondary archive for the external blackfin toolchains; however, we already to save the binary release of some external toolchains when they do not provide actual source archives. This is inherently bad, but solving this is a bigger concern, for another series... --- package/pkg-generic.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)