Merge remote-tracking branch 'upstream/master' into zope4py3

component/golang/buildout.cfg

@@ -19,11 +19,18 @@ shared = true
 configure-command = :
 location = @@LOCATION@@
 make-binary =
+make-targets =
+  cd src &&
+  unset GOBIN &&
 # build and test Go and its standard library
+  ./all.bash &&
 # clean intermediate cache before installing
 # contrary to build cache in gowork, build cache, that Go uses during its own build, is not reused anywhere:
 # https://github.com/golang/go/blob/go1.18.2-0-g8ed0e51b5e/src/cmd/dist/build.go#L239-L242
-make-targets= cd src && unset GOBIN && ./all.bash && GOCACHE=`pwd`/../pkg/obj/go-build ../bin/go clean -cache && cp -alf .. ${:location}
+  GOCACHE=`pwd`/../pkg/obj/go-build ../bin/go clean -cache &&
+# also clean the global cache, which is used during the tests.
+  ../bin/go clean -cache &&
+  cp -alf .. ${:location}
 # some testdata files have an issue with slapos.extension.strip.
 post-install = ${findutils:location}/bin/find ${:location}/src -type d -name testdata -exec rm -rf {} \; || true
 environment =

component/open62541/buildout.cfg

 # Implementation of OPC UA (OPC Unified Architecture). https://open62541.org/
 
 [buildout]
-parts = open62541
+parts =
+  open62541
+  gcc-10.2
 extends =
   ../cmake/buildout.cfg
   ../patch/buildout.cfg
   ../python3/buildout.cfg
+  ../gcc/buildout.cfg
   ../defaults.cfg
 
 [gcc]
@@ -35,4 +38,4 @@ configure-options =
 post-install =
   cp src/pubsub/*.h deps/open62541_queue.h @@LOCATION@@/include
 environment =
-  PATH=${python3:location}/bin:${patch:location}/bin:%(PATH)s
+  PATH=${gcc-10.2:location}/bin:${python3:location}/bin:${patch:location}/bin:%(PATH)s

software/beremiz-runtime/buildout.hash.cfg

 [instance-profile]
 filename = instance.cfg.in
-md5sum = e68998b1dc1c851303be5df6f2c2a84a
+md5sum = 4b7e36bbb077f91cdde5a4a05502cf71

software/beremiz-runtime/instance.cfg.in

@@ -53,9 +53,8 @@ recipe = slapos.cookbook:wrapper
 # needed libraries and tools inside SlapOS context
 environment =
   BEREMIZPYTHONPATH = {{ buildout['bin-directory'] }}/pythonwitheggs
-  PATH=$PATH:/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin
-  LIBRARY_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/x86_64-linux-gnu:/usr/lib:/lib/x86_64-linux-gnu/:/lib:/usr/lib/x86_64-linux-gnu/:{{ openssl_location }}/lib
-  COMPILER_PATH=/usr/lib/gcc/x86_64-linux-gnu/9/:/usr/lib/gcc/x86_64-linux-gnu/
+  PATH={{ gcc_location }}/bin
+  LIBRARY_PATH={{ openssl_location }}/lib
 
 command-line =
  {{ buildout['bin-directory'] }}/pythonwitheggs {{ buildout['directory'] }}/parts/beremiz-source/Beremiz_cli.py -k --project-home ${directory:home}/parts/download-plc/ build transfer run

software/beremiz-runtime/software.cfg

@@ -7,6 +7,7 @@ extends =
   ../../component/numpy/buildout.cfg
   ../../component/lxml-python/buildout.cfg
   ../../component/python-sslpsk/buildout.cfg
+  ../../component/gcc/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
 
@@ -17,10 +18,14 @@ parts =
   python-interpreter
   matiec
   open62541
+  gcc-10.2
 
 [python]
 part = python2.7
 
+[gcc]
+part = gcc-10.2
+
 [open62541]
 configure-options =
   -DBUILD_SHARED_LIBS=OFF
@@ -90,8 +95,7 @@ context =
   section buildout  buildout
   raw template_monitor ${monitor2-template:output}
   key openssl_location openssl:location
-# md5sum is fetched from buildout.hash.cfg and can be recalculated automatically by
-# calling update-hash
+  key gcc_location gcc-10.2:location
 
 [versions]
 Twisted = 20.3.0

software/osie-coupler/software.cfg

 [buildout]
 parts =
+  gcc-10.2
   open62541
   compile-coupler
   slapos-cookbook
@@ -11,6 +12,7 @@ extends =
   ../../component/open62541/buildout.cfg
   ../../stack/monitor/buildout.cfg
   ../../stack/slapos.cfg
+  ../../component/gcc/buildout.cfg
 
 # disable warning for time_t type structure after 2038
 # https://www.gnu.org/software/gnulib/manual/html_node/Avoiding-the-year-2038-problem.html
@@ -60,6 +62,7 @@ recipe = slapos.recipe.cmmi
 path = ${osie-repository:location}/coupler
 bin_dir = ${:path}/bin/
 environment =
+  PATH=${gcc-10.2:location}/bin:/usr/bin
   OPEN62541_HOME = ${open62541:location}
   OPEN62541_SOURCE_HOME = ${open62541-source:location}
   C_COMPILER_EXTRA_FLAGS = -L ${mbedtls:location}/lib -Wl,-rpath=${mbedtls:location}/lib -l:libopen62541.so -L${open62541:location}/lib -Wl,-rpath=${open62541:location}/lib -I${open62541:location}/include -I${open62541-source:location}/src/pubsub/ -I${open62541-source:location}/deps

software/slapos-master/software.cfg

@@ -11,6 +11,11 @@ wcfs-enable-default = true
 # Used to generate bt5lists.
 list += ${vifib:location}/master/bt5
 
+[default-bt5]
+list =
+  erp5_full_text_mroonga_catalog
+  slapos_configurator
+
 [erp5_repository_list]
 repository_id_list += vifib/master