.

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 1186464b43fc15cceb6084e54f8c7ff7
+md5sum = f7c9582099537c507b2a25e537b17716
 
 [template-ors]
 filename = instance-ors.cfg
@@ -28,7 +28,7 @@ md5sum = dc3bff7742d78a7831748a51659f63a4
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = e8eeeb424932cb189f84756a34b65e36
+md5sum = 8232657281b5cc2281d9e281ba2701e2
 
 [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 = 0a64b39a24484ca5c67ff1fe91b9667a
+md5sum = 89a0c95fa8357032fcd1867ba2b792d1
 
 [ru_sunwave_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sunwave/libinstance.jinja2.cfg

software/ors-amarisoft/instance.cfg

@@ -26,6 +26,7 @@ output = $${buildout:directory}/$${:filename}
 extra-context =
 depends = $${activate-eggs:recipe}
 context =
+    import xbuildout xbuildout
     import json_module json
     import xearfcn_module xlte.earfcn
     import xnrarfcn_module xlte.nrarfcn

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

@@ -24,11 +24,18 @@
 {%- macro buildout()  %}
 {%-   set root = slap_configuration['instance-title']   %}
 
+{#-   B returns buildout-encoded name %}
+{#-   set B = xbuildout.encode  #}
+{%-   macro B(name) %}
+{#-     always add some prefix to catch mismatched references without B()  #}
+{{-     'B' + xbuildout.encode(name)  -}}
+{%-   endmacro  %}
+
 {#-   part emits new buildout section and registers it into buildout.parts  #}
 {%-   set parts_list = [] %}
 {%-   macro part(name) %}
-{%-     do parts_list.append(name)  %}
-[{{ name }}]
+{%-     do parts_list.append(B(name))  %}
+[{{ B(name) }}]
 {%-   endmacro    %}
 
 {#-   promise emits new buildout section for a promise    #}

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

@@ -20,7 +20,7 @@ config-port = 830
 
 {#-  push firmware to RU #}
 
-[{{ru_ref}}-software-template]
+[{{ B('%s-software-template' % ru_ref) }}]
 recipe = slapos.recipe.template:jinja2
 extensions = jinja2.ext.do
 _logbase = ${directory:var}/log/{{ru_ref}}-software