[ALL] Refactor OVOS Container Images Build Script for Enhanced Readability
- Reorganized OVOS_CONTAINERS_IMAGES to list each image on a new line for improved readability. - Relocated the definition of OVOS_CONTAINERS_INSTALL_GUI_SERVICES to precede its conditional inclusion, ensuring clarity in script structure. - Adjusted conditional inclusion of GUI services in OVOS_CONTAINERS_IMAGES to ensure proper execution of GUI-related installation steps.
This commit is contained in:
parent
2f3d930410
commit
69992c78f8
|
@ -1,6 +1,6 @@
|
|||
################################################################################
|
||||
#
|
||||
# OVOS Container images
|
||||
# OVOS Container Images
|
||||
#
|
||||
################################################################################
|
||||
|
||||
|
@ -10,44 +10,47 @@ OVOS_CONTAINERS_LICENSE_FILES = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/../LICENSE
|
|||
OVOS_CONTAINERS_SITE = $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers
|
||||
OVOS_CONTAINERS_SITE_METHOD = local
|
||||
|
||||
OVOS_CONTAINERS_IMAGES = ovos-messagebus \
|
||||
ovos-phal \
|
||||
ovos-phal-admin \
|
||||
ovos-listener-dinkum \
|
||||
ovos-audio \
|
||||
ovos-core \
|
||||
ovos-cli
|
||||
# Base and conditional GUI container images
|
||||
OVOS_CONTAINERS_IMAGES = \
|
||||
ovos-messagebus \
|
||||
ovos-phal \
|
||||
ovos-phal-admin \
|
||||
ovos-listener-dinkum \
|
||||
ovos-audio \
|
||||
ovos-core \
|
||||
ovos-cli
|
||||
|
||||
# Installation of GUI services
|
||||
define OVOS_CONTAINERS_INSTALL_GUI_SERVICES
|
||||
$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/ovos_gui_websocket.container \
|
||||
$(TARGET_DIR)/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
|
||||
$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/ovos_gui.container \
|
||||
$(TARGET_DIR)/home/ovos/.config/containers/systemd/ovos_gui.container
|
||||
endef
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OVOS_CONTAINERS_GUI),y)
|
||||
OVOS_CONTAINERS_IMAGES += ovos-gui-websocket \
|
||||
ovos-gui-shell
|
||||
define OVOS_CONTAINERS_INSTALL_GUI_SERVICES
|
||||
|
||||
$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/ovos_gui_websocket.container \
|
||||
$(TARGET_DIR)/home/ovos/.config/containers/systemd/ovos_gui_websocket.container
|
||||
$(INSTALL) -D -m 644 $(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/ovos_gui.container \
|
||||
$(TARGET_DIR)/home/ovos/.config/containers/systemd/ovos_gui.container
|
||||
|
||||
OVOS_CONTAINERS_POST_INSTALL_TARGET_HOOKS += OVOS_CONTAINERS_INSTALL_GUI_SERVICES
|
||||
endef
|
||||
OVOS_CONTAINERS_IMAGES += \
|
||||
ovos-gui-websocket \
|
||||
ovos-gui-shell
|
||||
OVOS_CONTAINERS_POST_INSTALL_TARGET_HOOKS += OVOS_CONTAINERS_INSTALL_GUI_SERVICES
|
||||
endif
|
||||
|
||||
# Fetching container images
|
||||
define OVOS_CONTAINERS_BUILD_CMDS
|
||||
$(Q)mkdir -p $(@D)/images
|
||||
$(Q)mkdir -p $(OVOS_CONTAINERS_DL_DIR)
|
||||
$(foreach image,$(OVOS_CONTAINERS_IMAGES),\
|
||||
$(Q)mkdir -p $(@D)/images $(OVOS_CONTAINERS_DL_DIR)
|
||||
$(foreach image,$(OVOS_CONTAINERS_IMAGES), \
|
||||
$(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/fetch-container-image.sh \
|
||||
$(BR2_PACKAGE_OVOS_CONTAINERS_ARCH) $(image) "$(OVOS_CONTAINERS_DL_DIR)" "$(@D)/images"
|
||||
$(BR2_PACKAGE_OVOS_CONTAINERS_ARCH) $(image) "$(OVOS_CONTAINERS_DL_DIR)" "$(@D)/images"; \
|
||||
)
|
||||
endef
|
||||
|
||||
OVOS_CONTAINERS_INSTALL_IMAGES = YES
|
||||
|
||||
# Installation of container images
|
||||
define OVOS_CONTAINERS_INSTALL_IMAGES_CMDS
|
||||
$(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/install-container-image.sh "$(@D)" "$(TARGET_DIR)/home/ovos/.local/share/containers/storage"
|
||||
rm -rf $(TARGET_DIR)/home/ovos/.local/share/containers/storage/storage.lock
|
||||
rm -rf $(TARGET_DIR)/home/ovos/.local/share/containers/storage/userns.lock
|
||||
rm -rf $(TARGET_DIR)/home/ovos/.local/share/containers/storage/libpod
|
||||
$(BR2_EXTERNAL_OPENVOICEOS_PATH)/package/ovos-containers/install-container-image.sh \
|
||||
"$(@D)" "$(TARGET_DIR)/home/ovos/.local/share/containers/storage"
|
||||
rm -rf $(TARGET_DIR)/home/ovos/.local/share/containers/storage/{storage.lock,userns.lock,libpod}
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
|
Loading…
Reference in New Issue