Buildroot Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Luca Ceresoli <luca@lucaceresoli.net>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 04/13 v2] core/legal-info: ensure legal-info works in off-line mode
Date: Wed, 16 Dec 2015 12:30:41 +0100	[thread overview]
Message-ID: <56714B61.8040308@lucaceresoli.net> (raw)
In-Reply-To: <82f1af6280a8c913d3df331813dec4376fda2fb5.1450031251.git.yann.morin.1998@free.fr>

Dear Yann,

Yann E. MORIN wrote:
> Almost all packages which are saved for legal-info have their source
> archives downloaded as part of 'make source', which makes an off-line
> build completely possible [0].
>
> However, for the pre-configured external toolchains, the source tarball
> is different, as the main tarball is a binary package. And that source
> tarball is only downloaded during the legal-info phase, which makes it
> inconvenient for full off-line builds.
>
> We fix that in two steps:
>
>    - first, we move the declaration of _ACTUAL_SOURCE_TARBALL and _SITE
>      earlier in the pkg-generic.mk file, so we get those definitions at
>      the time we define the -source and -all-source rules;
>
>    - second, we add a new rule, $(1)-legal-source which only
>      $(1)-all-source depends on, so that we only download it for a
>      top-level 'make source', not as part of the standard download
>      mechanism (i.e. only what is really needed to build).
>
> This way, we can do a complete [0] off-line build and are still able to
> generate legal-info, while at the same time we do not incur any download
> overhead during a simple build.
>
> Also, we previously downloaded the _ACTUAL_SOURCE_TARBALL when it was
> not empty. However, since _ACTUAL_SOURCE_TARBALL default to the value of
> _SOURCE, it can not be empty when _SOURCE is not. Thus, we'd get a
> spurious report of a missing hash for the tarball, since it was not in
> a standard package rule (configure, build, install..) and thus would
> miss the PKG and PKGDIR variables to find the .hash file.
>
> We fix that in this commit as well, by:
>
>    - setting PKG and PKGDIR just for the -legal-source rule;
>
>    - only downloading _ACTUAL_SOURCE_TARBALL if it is not empty *and* not
>      the same as _SOURCE (to avoid a second report about the hash).
>
> [0] Save for nodejs which invarriably wants to download stuff at build
> time. Sigh... :-( Fixing that is work for another time...
>
> 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>
> Cc: Peter Korsgaard <jacmet@uclibc.org>

Thanks for the very detailed commit log message. It's very useful!

Just a couple of minor notes below.

[...]
> +# Download actual sources if they differ from the extracted sources
> +# (e.g. for external toolchains)
> +#
> +# We need to provide PKG and PKGDIR, because there's no .stamp file for
> +# the legal-info step.
> +$(1)-legal-source:	PKG=$(2)
> +$(1)-legal-source:	PKGDIR=$(pkgdir)
> +$(1)-legal-source:
> +ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),)
> +ifneq ($$($(2)_ACTUAL_SOURCE_TARBALL),$$($(2)_SOURCE))
> +	$$(call DOWNLOAD,$$($(2)_ACTUAL_SOURCE_SITE)/$$($(2)_ACTUAL_SOURCE_TARBALL))
> +endif # actuall sources != sources

actuall sources -> actual source

> +endif # actuall source != ""

actuall -> actual

With these fixed:
  Acked-by: Luca Ceresoli <luca@lucaceresoli.net>

[Tested with a minimal Sourcery ARM 2014.05 config]
Tested-by: Luca Ceresoli <luca@lucaceresoli.net>

-- 
Luca

  reply	other threads:[~2015-12-16 11:30 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-12-13 18:35 [Buildroot] [PATCH 0/13 v2] legal-info improvements and completeness (branch yem/legal-2) Yann E. MORIN
2015-12-13 18:35 ` [Buildroot] [PATCH 01/13 v2] core/legal-info: update the legal-info report header Yann E. MORIN
2015-12-16 22:20   ` Arnout Vandecappelle
2015-12-13 18:35 ` [Buildroot] [PATCH 02/13 v2] core/pkg-utils: add macro to hardlink-or-copy Yann E. MORIN
2015-12-16 22:21   ` Arnout Vandecappelle
2015-12-13 18:35 ` [Buildroot] [PATCH 03/13 v2] core/legal-info: use the macro to install source archives Yann E. MORIN
2015-12-16 22:23   ` Arnout Vandecappelle
2015-12-13 18:35 ` [Buildroot] [PATCH 04/13 v2] core/legal-info: ensure legal-info works in off-line mode Yann E. MORIN
2015-12-16 11:30   ` Luca Ceresoli [this message]
2015-12-16 22:47     ` Luca Ceresoli
2015-12-16 23:05       ` Yann E. MORIN
2015-12-16 23:09         ` Arnout Vandecappelle
2015-12-16 23:13           ` Yann E. MORIN
2015-12-16 23:19   ` Arnout Vandecappelle
2015-12-18 22:11     ` Yann E. MORIN
2015-12-18 22:30       ` Yann E. MORIN
2015-12-13 18:35 ` [Buildroot] [PATCH 05/13 v2] core/pkg-generic: add variable to store the package rawname-version Yann E. MORIN
2015-12-16 12:07   ` Luca Ceresoli
2015-12-16 23:44   ` Arnout Vandecappelle
2015-12-13 18:35 ` [Buildroot] [PATCH 06/13 v2] core/legal-info: install source archives in their own sub-dir Yann E. MORIN
2015-12-16 23:56   ` Arnout Vandecappelle
2015-12-18 22:53     ` Yann E. MORIN
2015-12-19  0:02       ` Arnout Vandecappelle
2015-12-13 18:35 ` [Buildroot] [PATCH 07/13 v2] core/legal-info: add package version to license directory Yann E. MORIN
2015-12-16 14:21   ` Luca Ceresoli
2015-12-13 18:35 ` [Buildroot] [PATCH 08/13 v2] core/apply-patches: store full path of applied patches Yann E. MORIN
2015-12-17 10:44   ` Luca Ceresoli
2015-12-13 18:35 ` [Buildroot] [PATCH 09/13 v2] core/legal-info: also save patches Yann E. MORIN
2015-12-17 10:45   ` Luca Ceresoli
2015-12-18 23:07     ` Yann E. MORIN
2015-12-13 18:35 ` [Buildroot] [PATCH 10/13 v2] core/legal-info: also save extra downloads Yann E. MORIN
2015-12-17 10:57   ` Luca Ceresoli
2015-12-13 18:35 ` [Buildroot] [PATCH 11/13 v2] core/legal-info: generate a hash of all saved files Yann E. MORIN
2015-12-13 18:35 ` [Buildroot] [PATCH 12/13 v2] core/legal-info: allow ignoring packages from the legal-info Yann E. MORIN
2015-12-13 18:35 ` [Buildroot] [PATCH 13/13 v2] core/pkg-virtual: ignore from legal-info output Yann E. MORIN

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56714B61.8040308@lucaceresoli.net \
    --to=luca@lucaceresoli.net \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox