fritzkink
2023-11-28 0e6b8465e1fa76dd600d4a240e95735e71db5d7c
make-rules/ips.mk
@@ -153,7 +153,6 @@
SAMPLE_MANIFEST_DIR =    $(COMPONENT_DIR)/manifests
SAMPLE_MANIFEST_FILE =   $(SAMPLE_MANIFEST_DIR)/sample-manifest.p5m
GENERIC_MANIFEST_FILE =   $(SAMPLE_MANIFEST_DIR)/generic-manifest.p5m
CANONICAL_MANIFESTS =   $(filter-out dummy.p5m,$(wildcard *.p5m))
ifneq ($(wildcard $(HISTORY)),)
@@ -218,7 +217,6 @@
VERSIONED_MANIFEST_TYPES =
UNVERSIONED_MANIFESTS = $(filter-out %-GENFRAG.p5m, $(CANONICAL_MANIFESTS))
GENERATE_GENERIC_TRANSFORMS=
# Look for manifests which need to be duplicated for each version of python.
ifeq ($(findstring -PYVER,$(CANONICAL_MANIFESTS)),-PYVER)
@@ -301,7 +299,6 @@
PRE_PUBLISHED=$(RESOLVED:%.depend.res=%.pre-published)
PUBLISHED=$(RESOLVED:%.depend.res=%.published)
HISTOGRIFIED =      $(HISTORICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.histogrified)
PUBLISHED +=      $(HISTORICAL_MANIFESTS:%.p5m=$(MANIFEST_BASE)-%.published)
COPYRIGHT_FILE ?=   $(COMPONENT_NAME)-$(COMPONENT_VERSION).copyright
@@ -324,7 +321,7 @@
sample-manifest:   $(GENERATED).p5m
$(GENERATED).p5m:   install $(GENERATE_EXTRA_DEPS)
   [ ! -d $(SAMPLE_MANIFEST_DIR) ] && $(MKDIR) $(SAMPLE_MANIFEST_DIR) || true
   $(MKDIR) $(SAMPLE_MANIFEST_DIR)
   $(PKGSEND) generate $(PKG_HARDLINKS:%=--target %) $(PROTO_DIR) | \
   $(PKGMOGRIFY) $(PKG_OPTIONS) /dev/fd/0 $(GENERATE_TRANSFORMS) | \
      sed -e '/^$$/d' -e '/^#.*$$/d' \
@@ -334,9 +331,6 @@
      $(PKGFMT) | \
      cat $(METADATA_TEMPLATE) - $(GENERATE_EXTRA_CMD) | \
      $(TEE) $@ $(SAMPLE_MANIFEST_FILE) >/dev/null
   if [ "$(GENERATE_GENERIC_TRANSFORMS)X" != "X" ]; \
   then sed $(GENERATE_GENERIC_TRANSFORMS) $(SAMPLE_MANIFEST_FILE) \
      | gawk '!seen[$$0]++' > $(GENERIC_MANIFEST_FILE); fi;
# copy the canonical manifest(s) to the build tree
$(MANIFEST_BASE)-%.generate:   %.p5m canonical-manifests