diff options
| author | Yann E. MORIN <yann.morin.1998@free.fr> | 2017-07-18 19:25:28 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-07-22 15:34:01 +0200 |
| commit | 3e5eb710673dc78645239b0905933e273eb0b62a (patch) | |
| tree | 5afa323b60b6cda80453e6130b0ef5d13530de73 | |
| parent | 68832249069dd96861a50bec602153dc65f9cf5b (diff) | |
| download | buildroot-3e5eb710673dc78645239b0905933e273eb0b62a.tar.gz buildroot-3e5eb710673dc78645239b0905933e273eb0b62a.zip | |
core/pkg-generic: add variable to skip skeleton dependency
We currently skip the skeleton dependency by checking if the current
package is the skeleton.
We are going to introduce more skeleton-related packages, so we
need a way to exclude the skeleton dependency for those, or we'd
get a circular dependency, for the same reason we need to skip
the toolchain dependency.
Instead of checking for all the skeleton-providing packages in the core
infra, add a new package options so that packages can express they do
not need the dependency on the skeleton, like we have an option to avoid
the depednency on the toolchain. The only packages that will use that
option are probably the skeletons, so we need not document this
variable, like we did not document the option to exclude the dependency
on the toolchain.
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: Romain Naour <romain.naour@gmail.com>
Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
| -rw-r--r-- | package/pkg-generic.mk | 7 | ||||
| -rw-r--r-- | package/skeleton/skeleton.mk | 1 |
2 files changed, 6 insertions, 2 deletions
diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 2916a7bbad..b2b3af7d8f 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -542,11 +542,14 @@ $(2)_REDIST_SOURCES_DIR = $$(REDIST_SOURCES_DIR_$$(call UPPERCASE,$(4)))/$$($(2) # When a target package is a toolchain dependency set this variable to # 'NO' so the 'toolchain' dependency is not added to prevent a circular -# dependency +# dependency. +# Similarly for the skeleton. $(2)_ADD_TOOLCHAIN_DEPENDENCY ?= YES +$(2)_ADD_SKELETON_DEPENDENCY ?= YES + ifeq ($(4),target) -ifneq ($(1),skeleton) +ifeq ($$($(2)_ADD_SKELETON_DEPENDENCY),YES) $(2)_DEPENDENCIES += skeleton endif ifeq ($$($(2)_ADD_TOOLCHAIN_DEPENDENCY),YES) diff --git a/package/skeleton/skeleton.mk b/package/skeleton/skeleton.mk index a310a314a5..9b7407a236 100644 --- a/package/skeleton/skeleton.mk +++ b/package/skeleton/skeleton.mk @@ -9,6 +9,7 @@ # Hence, skeleton would depends on the toolchain and the toolchain would depend # on skeleton. SKELETON_ADD_TOOLCHAIN_DEPENDENCY = NO +SKELETON_ADD_SKELETON_DEPENDENCY = NO # The skeleton also handles the merged /usr case in the sysroot SKELETON_INSTALL_STAGING = YES |
