Nicolas Massé 3 weeks ago
parent
commit
66e980a7cc
  1. 3
      common.mk
  2. 8
      nextcloud/log

3
common.mk

@ -371,8 +371,9 @@ $(TOP_LEVEL_DIR)/local.ign: $(TOP_LEVEL_DIR)/local.bu
butane --strict -o $@ $< butane --strict -o $@ $<
.INTERMEDIATE: fcos.bu .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 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. # 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) fcos.ign: fcos.bu $(TOP_LEVEL_DIR)/local.ign $(PROJECT_NAME).ign $(PROJECT_NAME)-examples.ign $(DEPENDENCIES_IGNITION_FILES)

8
nextcloud/log

@ -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
Loading…
Cancel
Save