.

software/ors-amarisoft/buildout.hash.cfg

@@ -28,7 +28,7 @@ md5sum = dc3bff7742d78a7831748a51659f63a4
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = 8232657281b5cc2281d9e281ba2701e2
+md5sum = 4dfdb18b93f4dae96aaf5deb05a04db9
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = b7906ca3a6b17963f78f680fc0842b74
 
 [ru_lopcomm_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/lopcomm/libinstance.jinja2.cfg
-md5sum = 89a0c95fa8357032fcd1867ba2b792d1
+md5sum = 48214e7aa5852cd1612235ab4ec8b67c
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

software/ors-amarisoft/ru/libinstance.jinja2.cfg

@@ -28,7 +28,7 @@
 {#-   set B = xbuildout.encode  #}
 {%-   macro B(name) %}
 {#-     always add some prefix to catch mismatched references without B()  #}
-{{-     'B' + xbuildout.encode(name)  -}}
+{{-     '' + xbuildout.encode(name)  -}}
 {%-   endmacro  %}
 
 {#-   part emits new buildout section and registers it into buildout.parts  #}

software/ors-amarisoft/ru/lopcomm/libinstance.jinja2.cfg

@@ -47,23 +47,23 @@ output = ${directory:script}/{{ru_ref}}-software.py
 
 {{ promise('%s-firmware' % ru_ref) }}
 promise = check_command_execute
-config-command = [ -f ${ {{-ru_ref}}-software-template:is_firmware_updated} ]
+config-command = [ -f ${ {{-B('%s-software-template' % ru_ref)}}:is_firmware_updated} ]
 
 
 {#-  push config to RU #}
 
 {%   if ru.get("cu_config_link", None) %}
-[{{ru_ref}}-cu-config-dl]
+[{{ B('%s-cu-config-dl' % ru_ref) }}]
 recipe = slapos.recipe.build:download
 url = {{ ru.cu_config_link }}
 version = {{ ru.get("cu_config_version") }}
 offline = false
 {%   endif %}
 
-[{{ru_ref}}-cu-config]
+[{{ B('%s-cu-config' % ru_ref) }}]
 <= config-base
 {% if ru.get("cu_config_link", None) %}
-url = ${ {{- ru_ref}}-cu-config-dl:target}
+url = ${ {{-B('%s-cu-config-dl' % ru_ref)}}:target}
 {% else %}
 url = {{ ru_lopcomm_cu_config_template }}
 {% endif %}