Commit 17c976bf authored by Xavier Thompson's avatar Xavier Thompson

[tmp] Revert OpenSSL fixup

In preparation to move all the

```
[openssl]
<= openssl-1.1
```

from individual Python2 SRs to a common stack/slapos-py2.cfg
introduced next.

This commit is kept separate on purpose until nexedi/master is stable.
parent 60d98ac7
...@@ -25,9 +25,6 @@ revision = ...@@ -25,9 +25,6 @@ revision =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
# we need persistent to be a git checkout because persistent tests want to # we need persistent to be a git checkout because persistent tests want to
# discover in-tree files that are not present in persistent egg when it is # discover in-tree files that are not present in persistent egg when it is
# installed in non-development mode: # installed in non-development mode:
......
...@@ -6,6 +6,3 @@ extends = ...@@ -6,6 +6,3 @@ extends =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
...@@ -5,6 +5,3 @@ extends = test.cfg ...@@ -5,6 +5,3 @@ extends = test.cfg
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
...@@ -17,6 +17,9 @@ extends = ...@@ -17,6 +17,9 @@ extends =
parts = parts =
python2.7 python2.7
[openssl]
<= openssl-1.1
[bootstrap2.7] [bootstrap2.7]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = zc.buildout eggs = zc.buildout
......
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[gcc] [gcc]
min_version = 0 min_version = 0
......
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
...@@ -30,9 +30,6 @@ parts = ...@@ -30,9 +30,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[rssgen-eggs] [rssgen-eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
interpreter = python-${:_buildout_section_name_} interpreter = python-${:_buildout_section_name_}
......
...@@ -45,9 +45,6 @@ max_version = 0 ...@@ -45,9 +45,6 @@ max_version = 0
# Beremiz works with python2.7 for now, the code is not yet upgraded for python3 # Beremiz works with python2.7 for now, the code is not yet upgraded for python3
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[open62541] [open62541]
# Beremiz need it to be in folder parts/open62541 # Beremiz need it to be in folder parts/open62541
# as Beremiz search for open62541 to BEREMIZ_PATH/../open62541 # as Beremiz search for open62541 to BEREMIZ_PATH/../open62541
......
...@@ -22,9 +22,6 @@ parts = ...@@ -22,9 +22,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[gcc] [gcc]
# we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component) # we want this SR to use a fixed gcc (so that we have the same gcc as open62541 component)
max_version = 0 max_version = 0
......
...@@ -11,9 +11,6 @@ download-cache = ${:directory}/download-cache ...@@ -11,9 +11,6 @@ download-cache = ${:directory}/download-cache
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[template] [template]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
# XXX: "template.cfg" is hardcoded in instanciation recipe # XXX: "template.cfg" is hardcoded in instanciation recipe
......
...@@ -4,6 +4,3 @@ extends = ...@@ -4,6 +4,3 @@ extends =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
...@@ -24,9 +24,6 @@ part = gcc-8.5 ...@@ -24,9 +24,6 @@ part = gcc-8.5
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[dream-repository.git] [dream-repository.git]
revision = f3bcf115741886835df8c0ca0fdbf510d77d8db8 revision = f3bcf115741886835df8c0ca0fdbf510d77d8db8
......
...@@ -9,9 +9,6 @@ parts = ...@@ -9,9 +9,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[file] [file]
# For old GCC like 4.9.2 on Debian 8. # For old GCC like 4.9.2 on Debian 8.
# XXX: This should be moved to component/rina-tools/buildout.cfg, next to where # XXX: This should be moved to component/rina-tools/buildout.cfg, next to where
......
...@@ -33,9 +33,6 @@ parts = ...@@ -33,9 +33,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[gcc:python2] [gcc:python2]
# use old gcc version for old scipy version used in python2 # use old gcc version for old scipy version used in python2
part = gcc-8.5 part = gcc-8.5
......
...@@ -50,9 +50,6 @@ parts = ...@@ -50,9 +50,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[neo] [neo]
<= go-git-package <= go-git-package
go.importpath = lab.nexedi.com/kirr/neo go.importpath = lab.nexedi.com/kirr/neo
......
...@@ -20,9 +20,6 @@ parts += ...@@ -20,9 +20,6 @@ parts +=
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[re6stnet-repository] [re6stnet-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/re6stnet.git repository = https://lab.nexedi.com/nexedi/re6stnet.git
......
...@@ -5,9 +5,6 @@ extends = ...@@ -5,9 +5,6 @@ extends =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[extra-eggs] [extra-eggs]
eggs += eggs +=
${re6stnet-setup:egg} ${re6stnet-setup:egg}
......
...@@ -15,9 +15,6 @@ parts = ...@@ -15,9 +15,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
# eggs for instance-rsn-client.cfg # eggs for instance-rsn-client.cfg
[eggs] [eggs]
recipe = zc.recipe.egg recipe = zc.recipe.egg
......
...@@ -13,9 +13,6 @@ parts = ...@@ -13,9 +13,6 @@ parts =
[python] [python]
part = python2.7 part = python2.7
[openssl]
<= openssl-1.1
[template] [template]
# Default template for the instance. # Default template for the instance.
recipe = slapos.recipe.template recipe = slapos.recipe.template
......
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