Commit dd37f39e authored by Jérome Perrin's avatar Jérome Perrin

WIP: include nxdbom

parent 9b50660b
...@@ -16,6 +16,7 @@ extends = ...@@ -16,6 +16,7 @@ extends =
../../component/selenium/buildout.cfg ../../component/selenium/buildout.cfg
../../stack/slapos.cfg ../../stack/slapos.cfg
../../stack/slapos-dev.cfg
../../stack/nxdtest.cfg ../../stack/nxdtest.cfg
../../stack/caucase/buildout.cfg ../../stack/caucase/buildout.cfg
...@@ -398,11 +399,14 @@ PyPDF2-patch-options = -p1 ...@@ -398,11 +399,14 @@ PyPDF2-patch-options = -p1
[eggs/scripts] [eggs/scripts]
recipe = zc.recipe.egg recipe = zc.recipe.egg
eggs = ${python-interpreter:eggs} eggs =
${python-interpreter:eggs}
${nxdbom-dev:egg}
scripts = scripts =
slapos slapos
supervisord supervisord
caucase caucase
nxdbom
[git-clone-repository] [git-clone-repository]
recipe = slapos.recipe.build:gitclone recipe = slapos.recipe.build:gitclone
...@@ -503,3 +507,8 @@ xmltodict = 0.13.0 ...@@ -503,3 +507,8 @@ xmltodict = 0.13.0
# Patched eggs # Patched eggs
PyPDF2 = 1.26.0+SlapOSPatched001 PyPDF2 = 1.26.0+SlapOSPatched001
[nxdbom-repository]
repository = https://lab.nexedi.com/jerome/nxd-bom.git
branch = feat/cyclonedx-wip
...@@ -7,7 +7,7 @@ parts = ...@@ -7,7 +7,7 @@ parts =
slapos-cookbook-develop slapos-cookbook-develop
slapos.core-dev slapos.core-dev
erp5.util-dev erp5.util-dev
slapos-cookbook nxdbom-dev
[slapos.toolbox-repository] [slapos.toolbox-repository]
...@@ -51,8 +51,21 @@ recipe = zc.recipe.egg:develop ...@@ -51,8 +51,21 @@ recipe = zc.recipe.egg:develop
egg = slapos.core egg = slapos.core
setup = ${slapos.core-repository:location} setup = ${slapos.core-repository:location}
[nxdbom-repository]
recipe = slapos.recipe.build:gitclone
repository = https://lab.nexedi.com/nexedi/nxd-bom.git
branch = master
git-executable = ${git:location}/bin/git
develop = true
[nxdbom-dev]
recipe = zc.recipe.egg:develop
egg = nxdbom
setup = ${nxdbom-repository:location}
[versions] [versions]
slapos.cookbook = ; slapos.cookbook =
slapos.core = ; slapos.core =
slapos.toolbox = ; slapos.toolbox =
erp5-util = ; erp5-util =
nxdbom =
...@@ -131,6 +131,7 @@ recipe = zc.recipe.egg ...@@ -131,6 +131,7 @@ recipe = zc.recipe.egg
eggs = eggs =
${lxml-python:egg} ${lxml-python:egg}
${python-PyYAML:egg} ${python-PyYAML:egg}
nxdbom
slapos.core slapos.core
slapos.libnetworkcache slapos.libnetworkcache
......
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