diff --git a/software/beremiz-runtime/software.cfg b/software/beremiz-runtime/software.cfg index 9f30697d7a72e86649bbb177a707b81aaf11bed2..95931f89d2ee75798d64c1ba22ce66b4dcc637e1 100644 --- a/software/beremiz-runtime/software.cfg +++ b/software/beremiz-runtime/software.cfg @@ -1,29 +1,26 @@ -# the default SlapOs profile which setup a modbus server instance usually over OSIE's coupler [buildout] -allow-picked-versions = true -extensions = mr.developer -auto-checkout = beremiz extends = buildout.hash.cfg - https://lab.nexedi.com/nexedi/slapos/raw/master/stack/monitor/buildout.cfg - https://lab.nexedi.com/nexedi/slapos/raw/master/stack/slapos.cfg - https://lab.nexedi.com/nexedi/slapos/raw/master/component/python3/buildout.cfg + ../../component/git/buildout.cfg + ../../stack/monitor/buildout.cfg + ../../stack/slapos.cfg parts = - python-interpreter + beremiz-source slapos-cookbook instance-profile + python-interpreter -# fix for pypi: https://mail.python.org/pipermail/distutils-sig/2017-October/031712.html -index = https://pypi.python.org/simple/ - -[sources] -beremiz = git https://github.com/beremiz/beremiz.git branch=default +[beremiz-source] +recipe = slapos.recipe.build:gitclone +repository = https://github.com/beremiz/beremiz.git +branch = default +git-executable = ${git:location}/bin/git [beremiz] recipe = zc.recipe.egg:develop egg = beremiz -setup = ${buildout:directory}/src/beremiz +setup = ${beremiz-source:location} [Twisted] recipe = zc.recipe.egg:custom @@ -31,6 +28,7 @@ egg = Twisted setup-eggs = six pathlib + incremental [python-interpreter] recipe = zc.recipe.egg @@ -53,7 +51,6 @@ eggs = click [instance-profile] recipe = slapos.recipe.template:jinja2 template = ${:_profile_base_location_}/${:filename} -mode = 0644 rendered = ${buildout:directory}/instance.cfg extensions = jinja2.ext.do context = @@ -95,4 +92,3 @@ typing = 3.10.0.0 autobahn = 19.11.2 txaio = 18.8.1 idna = 2.10 -mr.developer = 2.0.1