Merge branch 'master' into feature/legacy_i2c

turing-machines · May 8, 2024 · a58bb7b · a58bb7b
2 parents 2d3deb2 + a8acc5e
commit a58bb7b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/tp2bmc/package/bmc-ui/bmc-ui.mk b/tp2bmc/package/bmc-ui/bmc-ui.mk
@@ -3,15 +3,14 @@
 # bmc-ui
 ###########################################################
 
-BMC_UI_VERSION = 18c45c3a62d2cf2d682e864be303adf13568fc7a
-BMC_UI_SITE = $(call github,turing-machines,BMC-UI,$(BMC_UI_VERSION))
+BMC_UI_VERSION = v3.0.0
+BMC_UI_SITE = https://github.com/turing-machines/BMC-UI/releases/download/$(BMC_UI_VERSION)
 BMC_UI_LICENSE = GPL-2.0
 BMC_UI_LICENSE_FILES = LICENSE
 define BMC_UI_INSTALL_TARGET_CMDS
 	mkdir -p $(TARGET_DIR)/srv/bmcd/www/
-	cp -r $(BMC_UI_SRCDIR)/dist/* $(TARGET_DIR)/srv/bmcd/www/
+	cp -r $(BMC_UI_SRCDIR)* $(TARGET_DIR)/srv/bmcd/www/
 	chmod 755 $(TARGET_DIR)/srv/bmcd/www/
-	sed -i 's/%BMC_UI%/$(BMC_UI_VERSION)/g' $(TARGET_DIR)/srv/bmcd/www/index.html
 endef
 
 $(eval $(generic-package))
diff --git a/tp2bmc/package/bmcd/bmcd.mk b/tp2bmc/package/bmcd/bmcd.mk
@@ -3,7 +3,7 @@
 # bmcd
 ###########################################################
 
-BMCD_VERSION = 4e6dffa928629c1066f6c0cf4414d6c399b725b3
+BMCD_VERSION = a525f331627535fd7173f93554dba85fe641c42b
 BMCD_SITE = $(call github,turing-machines,bmcd,$(BMCD_VERSION))
 BMCD_LICENSE = Apache-2.0
 BMCD_LICENSE_FILES = LICENSE