nicolas
/
podman-quadlet-cookbook
mirror of https://github.com/nmasse-itix/podman-quadlet-cookbook.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #5 from nmasse-itix/fix/issue-4-dev-examples-merge 

Merge cookbook's own examples into fcos-dev.ign
main
Nicolas Massé 2 days ago
committed by GitHub
parent
fa1bb2d498 673a57c48a
commit
b2fd2113fe
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      scripts/common.mk

8
scripts/common.mk
View File

@ -472,12 +472,14 @@ $(TOP_LEVEL_DIR)/build/local.ign: $(TOP_LEVEL_DIR)/local.bu
.INTERMEDIATE: build/fcos-dev.bu build/fcos-test.bu .INTERMEDIATE: build/fcos-dev.bu build/fcos-test.bu
# Generate the Butane specs for development and testing by merging the current project's spec with those of the dependencies. # Generate the Butane specs for development and testing by merging the current project's spec with those of the dependencies.
# The development spec also includes the examples of the dependencies. # The development spec also includes the examples of the current project and of its dependencies.
# Whereas the testing spec only includes the main specs of the dependencies. # Whereas the testing spec only includes the main specs of the current project and of its dependencies.
build/fcos-dev.bu build/fcos-test.bu: DEPS := $(if $(filter-out base,$(PROJECT_NAME)),base $(DEPENDENCIES),$(DEPENDENCIES)) build/fcos-dev.bu build/fcos-test.bu: DEPS := $(if $(filter-out base,$(PROJECT_NAME)),base $(DEPENDENCIES),$(DEPENDENCIES))
build/fcos-dev.bu: DEPS := $(DEPS) $(addsuffix -examples,$(DEPS)) build/fcos-dev.bu: DEPS := $(DEPS) $(addsuffix -examples,$(DEPS))
build/fcos-test.bu: SELF := $(PROJECT_NAME)
build/fcos-dev.bu: SELF := $(PROJECT_NAME) $(PROJECT_NAME)-examples
build/fcos-dev.bu build/fcos-test.bu: %.bu: Makefile $(SCRIPTS_DIR)/default-butane-spec.sh build build/fcos-dev.bu build/fcos-test.bu: %.bu: Makefile $(SCRIPTS_DIR)/default-butane-spec.sh build
$(SCRIPTS_DIR)/default-butane-spec.sh $(PROJECT_NAME) $(DEPS) > $@ $(SCRIPTS_DIR)/default-butane-spec.sh $(SELF) $(DEPS) > $@
# Generate the final Fedora CoreOS ignition files (dev & test) 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 files (dev & test) by merging the Butane spec with the local and project-specific ignition files, as well as those of the dependencies.
build/fcos-dev.ign: $(TOP_LEVEL_DIR)/build/local.ign build/$(PROJECT_NAME).ign build/$(PROJECT_NAME)-examples.ign $(DEPENDENCIES_IGNITION_EXAMPLES_FILES) build/fcos-dev.ign: $(TOP_LEVEL_DIR)/build/local.ign build/$(PROJECT_NAME).ign build/$(PROJECT_NAME)-examples.ign $(DEPENDENCIES_IGNITION_EXAMPLES_FILES)

Write Preview
Loading…
Cancel
Save