diff --git a/common.mk b/common.mk index 7de4370..8d40dac 100644 --- a/common.mk +++ b/common.mk @@ -371,8 +371,9 @@ $(TOP_LEVEL_DIR)/local.ign: $(TOP_LEVEL_DIR)/local.bu butane --strict -o $@ $< .INTERMEDIATE: fcos.bu +fcos.bu: DEPS := $(if $(filter-out base,$(PROJECT_NAME)),base $(DEPENDENCIES),$(DEPENDENCIES)) fcos.bu: %.bu: Makefile $(TOP_LEVEL_DIR)/default-butane-spec.sh - $(TOP_LEVEL_DIR)/default-butane-spec.sh $(PROJECT_NAME) $(DEPENDENCIES) > $@ + $(TOP_LEVEL_DIR)/default-butane-spec.sh $(PROJECT_NAME) $(DEPS) > $@ # Generate the final Fedora CoreOS ignition file by merging the Butane spec with the local and project-specific ignition files, as well as those of the dependencies. fcos.ign: fcos.bu $(TOP_LEVEL_DIR)/local.ign $(PROJECT_NAME).ign $(PROJECT_NAME)-examples.ign $(DEPENDENCIES_IGNITION_FILES) diff --git a/nextcloud/log b/nextcloud/log deleted file mode 100644 index a93e7b0..0000000 --- a/nextcloud/log +++ /dev/null @@ -1,8 +0,0 @@ -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > base.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > base-examples.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > postgresql.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > postgresql-examples.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > traefik.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > traefik-examples.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > nextcloud.bu -generate-butane-spec.sh /tmp/butane-chroot-bz7yOt > nextcloud-examples.bu