[Buildroot] [PATCH 08/12 v2] fs: add all recursive dependencies to packages list
Arnout Vandecappelle
arnout at mind.be
Mon Apr 15 09:48:06 UTC 2019
On 14/04/2019 22:17, Yann E. MORIN wrote:
> Currently, only first-level dependencies of a filesystem are added to
> the global list of packages, thus missing all recursive dependencies.
>
> Use the newly introduced recursive variable instead, which already
> contains the rootfs-common dependencies too.
>
> Signed-off-by: "Yann E. MORIN" <yann.morin.1998 at free.fr>
> Cc: Arnout Vandecappelle <arnout at mind.be>
> Cc: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
> Cc: Thomas De Schampheleire <patrickdepinguin at gmail.com>
> ---
> fs/common.mk | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/fs/common.mk b/fs/common.mk
> index 5ec28ca183..f7989eac57 100644
> --- a/fs/common.mk
> +++ b/fs/common.mk
> @@ -190,7 +190,7 @@ rootfs-$(1): $$(BINARIES_DIR)/$$(ROOTFS_$(2)_FINAL_IMAGE_NAME)
>
> ifeq ($$(BR2_TARGET_ROOTFS_$(2)),y)
> TARGETS_ROOTFS += rootfs-$(1)
> -PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_DEPENDENCIES) $$(ROOTFS_COMMON_DEPENDENCIES))
> +PACKAGES += $$(filter-out rootfs-%,$$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES))
I don't like that we do this for rootfs but not for packages...
So maybe we should indeed change that in the package infra itself:
-PACKAGES += $(1)
+PACKAGES += $$($(2)_FINAL_RECURSIVE_DEPENDENCIES)
(The $$ is as usual not really needed since it will anyway be expanded
immediately because PACKAGES is defined as immediately-expanded (i.e. := instead
of =)).
And then of course also change the top-level Makefile to remove the use of
_FINAL_ALL_DEPENDENCIES there.
And as a bonus, you can remove -all-source, -all-external-deps and
-all-legal-info because PACKAGES is already complete.
But this is diverging a little bit from the show-info integration :-)
In other words, this patch is fine as is.
Regards,
Arnout
> endif
>
> # Check for legacy POST_TARGETS rules
>
More information about the buildroot
mailing list