From 914e3a542f50c5e6b4983563cbf36147b70b9342 Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Wed, 10 Jan 2024 17:13:21 +0100
Subject: [PATCH] ips.mk: make sure generated arch manifests are not used twice

---
 make-rules/ips.mk |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/make-rules/ips.mk b/make-rules/ips.mk
index 8518d75..9fcd729 100644
--- a/make-rules/ips.mk
+++ b/make-rules/ips.mk
@@ -154,17 +154,17 @@
 SAMPLE_MANIFEST_DIR = 	$(COMPONENT_DIR)/manifests
 SAMPLE_MANIFEST_FILE =	$(SAMPLE_MANIFEST_DIR)/sample-manifest.p5m
 
-CANONICAL_MANIFESTS =	$(filter-out dummy.p5m,$(wildcard *.p5m))
+CANONICAL_MANIFESTS =	$(filter-out dummy.p5m %.ARCH.p5m,$(wildcard *.p5m))
 ifneq ($(wildcard $(HISTORY)),)
 HISTORICAL_MANIFESTS = $(shell $(NAWK) -v FUNCTION=name -f $(GENERATE_HISTORY) < $(HISTORY))
 endif
 
 # Support for arch specific manifests
 ARCH_MANIFESTS =	$(wildcard *.p5m.$(MACH))
-GENERATED_ARCH_MANIFESTS =	$(ARCH_MANIFESTS:%.p5m.$(MACH)=%.p5m)
+GENERATED_ARCH_MANIFESTS =	$(ARCH_MANIFESTS:%.p5m.$(MACH)=%.ARCH.p5m)
 CANONICAL_MANIFESTS +=  $(GENERATED_ARCH_MANIFESTS)
 
-%.p5m: 	%.p5m.$(MACH)
+%.ARCH.p5m: 	%.p5m.$(MACH)
 	$(CP) $< $@
 
 define ips-print-depend-require-rule

--
Gitblit v1.9.3