Remove Mirantis related code
All vendor related things must be done in downstream repository. Change-Id: I7d487134cc3b683707a3259615a530152c71a3a5 Closes-Bug: #1560915
This commit is contained in:
parent
be7068e7d8
commit
e38c44b62a
Binary file not shown.
Before Width: | Height: | Size: 141 KiB After Width: | Height: | Size: 138 KiB |
Binary file not shown.
Before Width: | Height: | Size: 138 KiB |
|
@ -85,12 +85,7 @@ $(ISOROOT)/ks.yaml:
|
|||
cp $(KSYAML) $@
|
||||
|
||||
$(ISOROOT)/isolinux/isolinux.cfg: $(SOURCE_DIR)/iso/isolinux/isolinux.cfg ; $(ACTION.COPY)
|
||||
$(ISOROOT)/isolinux/splash.jpg: $(call depv,FEATURE_GROUPS)
|
||||
ifeq ($(filter mirantis,$(FEATURE_GROUPS)),mirantis)
|
||||
$(ISOROOT)/isolinux/splash.jpg: $(SOURCE_DIR)/iso/isolinux/splash.jpg ; $(ACTION.COPY)
|
||||
else
|
||||
$(ISOROOT)/isolinux/splash.jpg: $(SOURCE_DIR)/iso/isolinux/splash_community.jpg ; $(ACTION.COPY)
|
||||
endif
|
||||
$(ISOROOT)/ks.cfg: $(SOURCE_DIR)/iso/ks.template $(SOURCE_DIR)/iso/ks.py $(ISOROOT)/ks.yaml
|
||||
python $(SOURCE_DIR)/iso/ks.py \
|
||||
-t $(SOURCE_DIR)/iso/ks.template \
|
||||
|
@ -119,13 +114,8 @@ $(BUILD_DIR)/iso/isoroot.done: \
|
|||
# For example, \x20 is a white space (" ").
|
||||
# This is the limitation of kickstart boot options.
|
||||
|
||||
ifeq ($(filter mirantis,$(FEATURE_GROUPS)),mirantis)
|
||||
ISO_VOLUME_ID:=Mirantis_Fuel
|
||||
ISO_VOLUME_PREP:="Mirantis Inc."
|
||||
else
|
||||
ISO_VOLUME_ID:=OpenStack_Fuel
|
||||
ISO_VOLUME_PREP:="Fuel team"
|
||||
endif
|
||||
|
||||
# keep in mind that mkisofs touches some files inside directory
|
||||
# from which it builds iso image
|
||||
|
|
Loading…
Reference in New Issue