Browse Source

fix package scripts: examples do not ship units to start or enable

main
Nicolas Massé 2 weeks ago
parent
commit
833b83ca01
  1. 1
      scripts/common.mk
  2. 2
      scripts/generate-butane-spec.sh

1
scripts/common.mk

@ -451,6 +451,7 @@ build/$(PROJECT_NAME).tar.gz build/$(PROJECT_NAME).bu build/$(PROJECT_NAME)-exam
$(SCRIPTS_DIR)/generate-tarball.sh build/$(PROJECT_NAME).tar.gz; \ $(SCRIPTS_DIR)/generate-tarball.sh build/$(PROJECT_NAME).tar.gz; \
(cat $(SCRIPTS_DIR)/butane.blocklist; echo; for file in $$(find "$$TARGET_CHROOT"); do echo "$${file#$$TARGET_CHROOT}"; done) | sort -u | grep -v -E '^$$' > "$(BUTANE_BLOCKLIST)"; \ (cat $(SCRIPTS_DIR)/butane.blocklist; echo; for file in $$(find "$$TARGET_CHROOT"); do echo "$${file#$$TARGET_CHROOT}"; done) | sort -u | grep -v -E '^$$' > "$(BUTANE_BLOCKLIST)"; \
run make install-examples; \ run make install-examples; \
export SYSTEMD_ENABLE_UNITS="" SYSTEMD_START_UNITS=""; \
EXAMPLES_YQ_FILES="$$(if [ -f "overlay-examples.bu" ]; then echo "- overlay-examples.bu"; else echo "-"; fi)"; \ EXAMPLES_YQ_FILES="$$(if [ -f "overlay-examples.bu" ]; then echo "- overlay-examples.bu"; else echo "-"; fi)"; \
echo "generate-butane-spec.sh build/$(PROJECT_NAME)-examples.bu"; \ echo "generate-butane-spec.sh build/$(PROJECT_NAME)-examples.bu"; \
$(SCRIPTS_DIR)/generate-butane-spec.sh | yq eval-all '. as $$item ireduce ({}; . *+ $$item)' $$EXAMPLES_YQ_FILES > build/$(PROJECT_NAME)-examples.bu; \ $(SCRIPTS_DIR)/generate-butane-spec.sh | yq eval-all '. as $$item ireduce ({}; . *+ $$item)' $$EXAMPLES_YQ_FILES > build/$(PROJECT_NAME)-examples.bu; \

2
scripts/generate-butane-spec.sh

@ -12,7 +12,7 @@
# - BUTANE_BLOCKLIST: the path to a file containing a list of files and directories (one per line) to ignore # - BUTANE_BLOCKLIST: the path to a file containing a list of files and directories (one per line) to ignore
# (i.e., files and directories that are already part of the CoreOS default installation # (i.e., files and directories that are already part of the CoreOS default installation
# or belonging to another package). # or belonging to another package).
# - SYSTEMD_MAIN_UNIT_NAMES: the list of systemd main unit names to enable. # - SYSTEMD_ENABLE_UNITS: the list of systemd main unit names to enable.
# #
# The path to of the generated butane file is $1, or stdout if $1 is not provided. # The path to of the generated butane file is $1, or stdout if $1 is not provided.
# #

Loading…
Cancel
Save