bump calypso, nanomq, get calypso dep + submodule

Northeastern-Electric-Racing · Mar 14, 2024 · e3367ad · e3367ad
1 parent 0a6952a
commit e3367ad
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/odysseus/Dockerfile b/odysseus/Dockerfile
@@ -33,6 +33,8 @@ RUN apt-get install -y \
     git-lfs \
     util-linux
 
+# just for calypso require ruamel.yaml
+RUN apt-get install -y python3-pip && pip install "ruamel.yaml<0.18.0"
 
 # add all buildroot files there
 WORKDIR /home/odysseus/build

diff --git a/odysseus/odysseus_tree/package/calypso/Config.in b/odysseus/odysseus_tree/package/calypso/Config.in
@@ -8,6 +8,8 @@ config BR2_PACKAGE_CALYPSO
 
         Written in Rust, utlizing socketcand.
 
+        NOTE: Requires python3-ruamel.yaml to be installed to host!
+
         https://github.com/Northeastern-Electric-Racing/Calypso
 
 if BR2_PACKAGE_CALYPSO

diff --git a/odysseus/odysseus_tree/package/calypso/calypso.mk b/odysseus/odysseus_tree/package/calypso/calypso.mk
@@ -1,6 +1,7 @@
-CALYPSO_VERSION = 3f3a12834838448458cc47a21b904eca80daf3d4
+CALYPSO_VERSION = bd753c18c30375c8cb66c5d118b1f2caf574d571
 CALYPSO_SITE_METHOD = git
 CALYPSO_SITE = https://github.com/Northeastern-Electric-Racing/Calypso
+CALYPSO_GIT_SUBMODULES = YES
 CALYPSO_DEPENDENCIES += openssl
 
 define CALYPSO_INSTALL_INIT_SYSV

diff --git a/odysseus/odysseus_tree/package/nanomq/nanomq.mk b/odysseus/odysseus_tree/package/nanomq/nanomq.mk
@@ -1,6 +1,6 @@
 # must use later version then stable due to build issue with log_err function.
 # Fix upon next nanomq release, as the build system is somewhat complicated and often changes
-NANOMQ_VERSION = 0.21.2
+NANOMQ_VERSION = 0.21.6
 NANOMQ_SITE_METHOD = git
 NANOMQ_SITE = https://github.com/nanomq/nanomq
 NANOMQ_GIT_SUBMODULES = YES
@@ -11,7 +11,7 @@ NANOMQ_CMAKE_BACKEND = ninja
 NANOMQ_SUPPORTS_IN_SOURCE_BUILD = NO
 NANOMQ_INSTALL_STAGING = YES
 
-NANOMQ_CONF_OPTS += -DCMAKE_C_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0"
+#NANOMQ_CONF_OPTS += -DCMAKE_C_FLAGS="-D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -O0 -g0"
 define NANOMQ_INSTALL_INIT_SYSV
     $(INSTALL) -D -m 0755 $(BR2_EXTERNAL_ODY_TREE_PATH)/package/nanomq/S75nanomq $(TARGET_DIR)/etc/init.d/masked.S75nanomq
 endef