From 68bd2c5339b01bd7fae18b9d213e3796eb24661f Mon Sep 17 00:00:00 2001 From: Christian Kellner Date: Fri, 18 Jun 2021 16:12:36 +0000 Subject: [PATCH] Makefile: use new mpp tool Use the new unified mpp tool instead of the two separate tools. --- Makefile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 565c0d84..849c8c0c 100644 --- a/Makefile +++ b/Makefile @@ -209,9 +209,7 @@ TEST_MANIFESTS_GEN = $(TEST_MANIFESTS_MPP:%.mpp.json=%.json) .PHONY: $(TEST_MANIFESTS_GEN) $(TEST_MANIFESTS_GEN): %.json: %.mpp.json - $(SRCDIR)/tools/mpp-depsolve.py <"$<" \ - | $(SRCDIR)/tools/mpp-import-pipeline.py >"$@" \ - "--cwd=$(SRCDIR)/test/data/manifests" + $(SRCDIR)/tools/mpp.py -I "$(SRCDIR)/test/data/manifests" "$<" "$@" $(SRCDIR)/test/data/manifests/f34-base.json: $(SRCDIR)/test/data/manifests/f34-build.json $(SRCDIR)/test/data/manifests/fedora-boot.json: $(SRCDIR)/test/data/manifests/f34-build.json