Commit ec66cf9f authored by Kirill Smelkov's avatar Kirill Smelkov

Merge branch 'x/lte-multiru' into x/lte-multiru+quote

* x/lte-multiru:
  format-json, test: Don't force ASCII
  software/nayuos: fix instantiation
  component/haproxy: Version up
  Add needed python module for Beremiz / OSIE coupler integration tests.
parents 412a2ac8 9c4c7a6b
...@@ -13,8 +13,8 @@ parts = haproxy ...@@ -13,8 +13,8 @@ parts = haproxy
[haproxy] [haproxy]
recipe = slapos.recipe.cmmi recipe = slapos.recipe.cmmi
shared = true shared = true
url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.15.tar.gz url = https://www.haproxy.org/download/2.6/src/haproxy-2.6.16.tar.gz
md5sum = ecac9724e3ca6368624fb2fab29dd366 md5sum = b01e605cdaf2742fcedf214a61e187b4
configure-command = true configure-command = true
# for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET, # for Linux kernel 2.6.28 and above, we use "linux-glibc" as the TARGET,
# otherwise use "generic". # otherwise use "generic".
......
...@@ -29,6 +29,8 @@ eggs = ...@@ -29,6 +29,8 @@ eggs =
slapos.core slapos.core
websocket-client websocket-client
requests requests
opcua
[versions] [versions]
websocket-client = 1.4.2 websocket-client = 1.4.2
opcua = 0.98.13
...@@ -14,4 +14,4 @@ ...@@ -14,4 +14,4 @@
# not need these here). # not need these here).
[template-instance] [template-instance]
filename = instance.cfg filename = instance.cfg
md5sum = 7a558c2b9461ec588c9d77bdeef64e4d md5sum = 5a765463118f8b2a09df6260f56c2175
...@@ -25,7 +25,7 @@ develop-eggs-directory = {{ develop_eggs_directory }} ...@@ -25,7 +25,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
# needed for the "repo" command (to download many git repositories) # needed for the "repo" command (to download many git repositories)
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git repository = https://chromium.googlesource.com/chromium/tools/depot_tools.git
branch = master branch = main
git-executable = {{ git_path }}/bin/git git-executable = {{ git_path }}/bin/git
[customize-path] [customize-path]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment