From f5f17c4dd7a449941a395002b0b9dae37368a8f7 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 7 May 2019 22:52:29 +0200 Subject: [PATCH] core: remove show-dependency-tree show-dependency-tree was introduced in this release cycle, as a way to quickly and easily provide the dependency tree to graph-depends. show-dependency-tree is no longer used, now that graph-depends has been switched over to using the more versatile show-info. Beside, show-dependency-tree has never been part of a release. Drop it. Signed-off-by: "Yann E. MORIN" Cc: Thomas Petazzoni Cc: Thomas De Schampheleire Cc: Arnout Vandecappelle Signed-off-by: Peter Korsgaard --- Makefile | 4 ---- fs/common.mk | 8 -------- package/pkg-generic.mk | 6 ------ 3 files changed, 18 deletions(-) diff --git a/Makefile b/Makefile index 86e444da98..4da2453288 100644 --- a/Makefile +++ b/Makefile @@ -877,10 +877,6 @@ graph-depends-requirements: @dot -? >/dev/null 2>&1 || \ { echo "ERROR: The 'dot' program from Graphviz is needed for graph-depends" >&2; exit 1; } -.PHONY: show-dependency-tree -show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(PACKAGES) $(TARGETS_ROOTFS)) - @: - .PHONY: graph-depends graph-depends: graph-depends-requirements @$(INSTALL) -d $(GRAPHS_DIR) diff --git a/fs/common.mk b/fs/common.mk index 6dd1774726..fceb38c5b9 100644 --- a/fs/common.mk +++ b/fs/common.mk @@ -61,10 +61,6 @@ ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES = $(sort \ ) \ $(ROOTFS_COMMON_FINAL_RECURSIVE_DEPENDENCIES__X)) -rootfs-common-show-dependency-tree: $(patsubst %,%-show-dependency-tree,$(ROOTFS_COMMON_DEPENDENCIES)) - $(info rootfs-common: host) - $(info rootfs-common -> $(foreach d,$(ROOTFS_COMMON_DEPENDENCIES),$(d))) - .PHONY: rootfs-common rootfs-common: $(ROOTFS_COMMON_DEPENDENCIES) target-finalize @$(call MESSAGE,"Generating root filesystems common tables") @@ -117,10 +113,6 @@ ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES = $$(sort \ ) \ $$(ROOTFS_$(2)_FINAL_RECURSIVE_DEPENDENCIES__X)) -rootfs-$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$(ROOTFS_$(2)_DEPENDENCIES)) - $$(info rootfs-$(1): host) - $$(info rootfs-$(1) -> $$(foreach d,$$(ROOTFS_$(2)_DEPENDENCIES),$$(d))) - ifeq ($$(BR2_TARGET_ROOTFS_$(2)_GZIP),y) ROOTFS_$(2)_COMPRESS_EXT = .gz ROOTFS_$(2)_COMPRESS_CMD = gzip -9 -c diff --git a/package/pkg-generic.mk b/package/pkg-generic.mk index 67782138b4..e44f5d913c 100644 --- a/package/pkg-generic.mk +++ b/package/pkg-generic.mk @@ -862,11 +862,6 @@ $(1)-show-build-order: $$(patsubst %,%-show-build-order,$$($(2)_FINAL_ALL_DEPEND @: $$(info $(1)) -$(1)-show-dependency-tree: $$(patsubst %,%-show-dependency-tree,$$($(2)_FINAL_ALL_DEPENDENCIES)) - @: - $$(info $(1): $(4) $$(if $$($(2)_IS_VIRTUAL),virtual,$$($(2)_DL_VERSION))) - $$(info $(1) -> $$($(2)_FINAL_ALL_DEPENDENCIES)) - $(1)-show-info: @: $$(info $$(call clean-json,{ $$(call json-info,$(2)) })) @@ -1101,7 +1096,6 @@ DL_TOOLS_DEPENDENCIES += $$(call extractor-dependency,$$($(2)_SOURCE)) $(1)-reconfigure \ $(1)-reinstall \ $(1)-rsync \ - $(1)-show-dependency-tree \ $(1)-show-depends \ $(1)-show-info \ $(1)-show-version \ -- 2.30.2