Skip to content
Snippets Groups Projects
Commit e93173c4 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

Add support for factory images with other suffixes than .bin and profiles without factory images

This adds the new macro GluonProfileFactorySuffix which can be used to override
the factory images suffix ".bin". When the suffix is set to the empty string
Gluon will assume that there are no factory images.
parent 408482c6
No related branches found
No related tags found
No related merge requests found
...@@ -57,6 +57,9 @@ image/$(1): FORCE ...@@ -57,6 +57,9 @@ image/$(1): FORCE
+@$$(GLUONMAKE) $$@ +@$$(GLUONMAKE) $$@
endef endef
define GluonProfileFactorySuffix
endef
define GluonModel define GluonModel
endef endef
...@@ -127,9 +130,14 @@ define GluonProfile ...@@ -127,9 +130,14 @@ define GluonProfile
PROFILES += $(1) PROFILES += $(1)
PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES)) PROFILE_PACKAGES += $(filter-out -%,$(2) $(GLUON_$(1)_SITE_PACKAGES))
GLUON_$(1)_DEFAULT_PACKAGES := $(2) GLUON_$(1)_DEFAULT_PACKAGES := $(2)
GLUON_$(1)_FACTORY_SUFFIX := .bin
GLUON_$(1)_MODELS := GLUON_$(1)_MODELS :=
endef endef
define GluonProfileFactorySuffix
GLUON_$(1)_FACTORY_SUFFIX := $(2)
endef
define GluonModel define GluonModel
GLUON_$(1)_MODELS += $(3) GLUON_$(1)_MODELS += $(3)
GLUON_$(1)_MODEL_$(3) := $(2) GLUON_$(1)_MODEL_$(3) := $(2)
...@@ -339,11 +347,13 @@ image: FORCE ...@@ -339,11 +347,13 @@ image: FORCE
PROFILE="$(PROFILE)" KDIR="$(PROFILE_KDIR)" TARGET_DIR="$(TARGET_DIR)" BIN_DIR="$(BIN_DIR)" TMP_DIR="$(TMP_DIR)" PROFILE="$(PROFILE)" KDIR="$(PROFILE_KDIR)" TARGET_DIR="$(TARGET_DIR)" BIN_DIR="$(BIN_DIR)" TMP_DIR="$(TMP_DIR)"
$(foreach model,$(GLUON_$(PROFILE)_MODELS), \ $(foreach model,$(GLUON_$(PROFILE)_MODELS), \
rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model).bin && \
rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(model)-sysupgrade.bin && \ rm -f $(GLUON_IMAGEDIR)/sysupgrade/gluon-*-$(model)-sysupgrade.bin && \
\
cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))-factory.bin $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model).bin && \
cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))-sysupgrade.bin $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(model)-sysupgrade.bin && \ cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))-sysupgrade.bin $(GLUON_IMAGEDIR)/sysupgrade/$(IMAGE_PREFIX)-$(model)-sysupgrade.bin && \
\
$(if $(GLUON_$(PROFILE)_FACTORY_SUFFIX), \
rm -f $(GLUON_IMAGEDIR)/factory/gluon-*-$(model)$(GLUON_$(PROFILE)_FACTORY_SUFFIX) && \
cp $(BIN_DIR)/gluon-$(GLUON_$(PROFILE)_MODEL_$(model))-factory$(GLUON_$(PROFILE)_FACTORY_SUFFIX) $(GLUON_IMAGEDIR)/factory/$(IMAGE_PREFIX)-$(model)$(GLUON_$(PROFILE)_FACTORY_SUFFIX) && \
) \
) : ) :
image/%: $(gluon_prepared_stamp) image/%: $(gluon_prepared_stamp)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment