From cc874342e1761948aa8a96730b56f080b6578990 Mon Sep 17 00:00:00 2001 From: "Jason N." <33561705+JasonN3@users.noreply.github.com> Date: Tue, 27 Feb 2024 18:29:35 -0500 Subject: [PATCH] remove .in --- Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 4cd35b5..50a0f0e 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ _IMAGE_REPO_ESCAPED = $(subst /,\/,$(IMAGE_REPO)) _IMAGE_REPO_DOUBLE_ESCAPED = $(subst \,\\\,$(_IMAGE_REPO_ESCAPED)) _VOLID = $(firstword $(subst -, ,$(IMAGE_NAME)))-$(ARCH)-$(IMAGE_TAG) _REPO_FILES = $(notdir $(REPOS)) -_LORAX_TEMPLATES = $(shell ls lorax_templates) +_LORAX_TEMPLATES = $(subst .in,,$(shell ls lorax_templates/*.tmpl.in)) ifeq ($(VARIANT),Server) _LORAX_ARGS = --macboot --noupgrade @@ -49,13 +49,13 @@ lorax_templates/%.tmpl: lorax_templates/%.tmpl.in sed -i "s/\$$basearch/${ARCH}/g" $(_BASE_DIR)/$*.repo # Step 3: Build boot.iso using Lorax -boot.iso: $(foreach file,$(_LORAX_TEMPLATES),lorax_templates/$(file)) $(_REPO_FILES) +boot.iso: $(_LORAX_TEMPLATES) $(_REPO_FILES) rm -Rf $(_BASE_DIR)/results lorax -p $(IMAGE_NAME) -v $(VERSION) -r $(VERSION) -t $(VARIANT) \ --isfinal --squashfs-only --buildarch=$(ARCH) --volid=$(_VOLID) \ $(_LORAX_ARGS) \ $(foreach file,$(_REPO_FILES),--repo $(_BASE_DIR)/$(file)) \ - $(foreach file,$(_LORAX_TEMPLATES),--add-template $(_BASE_DIR)/lorax_templates/$(file)) \ + $(foreach file,$(_LORAX_TEMPLATES),--add-template $(_BASE_DIR)/$(file)) \ $(foreach file,$(ADDITIONAL_TEMPLATES),--add-template $(file)) \ --rootfs-size $(ROOTFS_SIZE) \ $(_BASE_DIR)/results/