Skip to content

Commit

Permalink
integrated further CloudMatic related updates to integrate an aarch64
Browse files Browse the repository at this point in the history
platform version of the nginx reverse proxy binary.
  • Loading branch information
jens-maus committed Oct 15, 2023
1 parent da6adeb commit 430ca81
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion buildroot-external/package/cloudmatic/cloudmatic.hash
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Locally computed
sha256 7dc6ff9e252773d1dc92f87d62670ce97d286e288946f7a527205d0fc27af869 cloudmatic-3e1d04f432202f767bd58971e81b1c3cff8481d6.tar.gz
sha256 cce1ddbfe8523574421bb76865900e897c93bea74482b8a0cbfa4dfeb657e422 cloudmatic-9e006bf58706e52ee5b23964e2ca064bb14775f4.tar.gz
11 changes: 7 additions & 4 deletions buildroot-external/package/cloudmatic/cloudmatic.mk
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
#
################################################################################

CLOUDMATIC_VERSION = 3e1d04f432202f767bd58971e81b1c3cff8481d6
CLOUDMATIC_VERSION = 9e006bf58706e52ee5b23964e2ca064bb14775f4
CLOUDMATIC_SITE = $(call github,jens-maus,CloudMatic-CCUAddon,$(CLOUDMATIC_VERSION))
CLOUDMATIC_LICENSE = BSD-3-Clause

ifeq ($(BR2_arm),y)
NGINX_BIN=nginx.pi
NGINX_BIN=nginx.armhf
ZABBIX_BIN=zabbix_agentd
endif

ifeq ($(BR2_aarch64),y)
NGINX_BIN=nginx.pi
NGINX_BIN=nginx.aarch64
ZABBIX_BIN=zabbix_agentd
endif

Expand All @@ -35,8 +35,11 @@ define CLOUDMATIC_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/openvpn $(TARGET_DIR)/opt/mh/
cp -a $(@D)/user $(TARGET_DIR)/opt/mh/
cp -a $(@D)/www $(TARGET_DIR)/opt/mh/
rm -f $(TARGET_DIR)/opt/mh/user/nginx.ccu? $(TARGET_DIR)/opt/mh/user/nginx.pi $(TARGET_DIR)/opt/mh/user/nginx $(TARGET_DIR)/opt/mh/user/nginx.i686 $(TARGET_DIR)/opt/mh/user/zabbix_agentd $(TARGET_DIR)/opt/mh/user/zabbix_agentd.i686
rm -f $(TARGET_DIR)/opt/mh/user/nginx*
[[ -n "$(NGINX_BIN)" ]] && $(INSTALL) -m 0755 $(@D)/user/$(NGINX_BIN) $(TARGET_DIR)/opt/mh/user/nginx || true
$(INSTALL) -D -m 0644 $(@D)/user/nginx.conf $(TARGET_DIR)/opt/mh/user/
$(INSTALL) -D -m 0644 $(@D)/user/nginx.conf.default $(TARGET_DIR)/opt/mh/user/
rm -f $(TARGET_DIR)/opt/mh/user/zabbix_agentd*
[[ -n "$(ZABBIX_BIN)" ]] && $(INSTALL) -m 0755 $(@D)/user/$(ZABBIX_BIN) $(TARGET_DIR)/opt/mh/user/zabbix_agentd || true
endef

Expand Down

0 comments on commit 430ca81

Please sign in to comment.