Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Dmitry Blinov
slapos
Commits
27339209
Commit
27339209
authored
Jun 09, 2020
by
Dmitry Blinov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make qcom and statussrv listen to SlapOS-given IP
parent
af5e04f3
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
11 additions
and
11 deletions
+11
-11
component/meson/buildout.cfg
component/meson/buildout.cfg
+6
-9
component/proviewR/buildout.cfg
component/proviewR/buildout.cfg
+2
-0
software/proviewR/instance-proview-r.cfg.jinja2.in
software/proviewR/instance-proview-r.cfg.jinja2.in
+2
-1
software/proviewR/software.cfg
software/proviewR/software.cfg
+1
-1
No files found.
component/meson/buildout.cfg
View file @
27339209
...
@@ -7,14 +7,11 @@ extends =
...
@@ -7,14 +7,11 @@ extends =
parts = meson
parts = meson
[meson]
[meson]
recipe = slapos.recipe.cmmi
#recipe = zc.recipe.egg:scripts
url = https://github.com/mesonbuild/meson/archive/0.52.0.tar.gz
#egg = meson
md5sum = fea87e71e6d21d377f2cb82cc52914a7
recipe = plone.recipe.command
configure-command = true
command =
make-binary = bash -c "${python3:executable} -m venv --clear ${:location} && \
bash -c "${python3:executable} -m venv --clear ${:location} && \
. ${:location}/bin/activate && \
. ${:location}/bin/activate && \
pip install
meson==0.52
--prefix ${:location}"
pip install
.
--prefix ${:location}"
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
component/proviewR/buildout.cfg
View file @
27339209
...
@@ -309,6 +309,8 @@ compile-dir = ${:location}__compile__
...
@@ -309,6 +309,8 @@ compile-dir = ${:location}__compile__
#sanitizer-flags = -fsanitize=address
#sanitizer-flags = -fsanitize=address
sanitizer-flags =
sanitizer-flags =
configure-command =
configure-command =
sed -i 's#l.sa.sin_addr.s_addr = htonl(INADDR_ANY)#l.sa.sin_addr.s_addr = inet_addr(getenv("SLAP_DEPLOY_IP"))#' ${:compile-dir}/src/exe/rt_qmon/src/rt_qmon.c
sed -i 's#soap_bind(\&soap, NULL, 18084, 100)#soap_bind(\&soap, getenv("SLAP_DEPLOY_IP"), 18084, 100)#' ${:compile-dir}/src/exe/rt_statussrv/src/rt_statussrv.cpp
sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh
sed -i "s#aroot=/usr/local/adm#aroot=${:aroot}#" ${:compile-dir}/build.sh
sed -i "s#(cross_compile)#(cross_compile) ${:rpaths} #" ${:compile-dir}/xtt/exe/wb_ge/qt/link_rule.mk
sed -i "s#(cross_compile)#(cross_compile) ${:rpaths} #" ${:compile-dir}/xtt/exe/wb_ge/qt/link_rule.mk
sed -i "/chmod a+x pkg_unpack.sh/a sed -i '/USER/,\$d' pkg_unpack.sh" ${:compile-dir}/src/exp/com/src/pwr_pkg.sh
sed -i "/chmod a+x pkg_unpack.sh/a sed -i '/USER/,\$d' pkg_unpack.sh" ${:compile-dir}/src/exp/com/src/pwr_pkg.sh
...
...
software/proviewR/instance-proview-r.cfg.jinja2.in
View file @
27339209
...
@@ -142,7 +142,7 @@ command = echo 'cp -r {{ proview_directory }}/local/adm/db/ ${:pwr-db}/.. '
...
@@ -142,7 +142,7 @@ command = echo 'cp -r {{ proview_directory }}/local/adm/db/ ${:pwr-db}/.. '
$pwr_exe/rt_xtt &
$pwr_exe/rt_xtt &
EOF
EOF
update-command =
echo updating and doing nothing
update-command =
${:command}
stop-on-error = true
stop-on-error = true
[proview-environment]
[proview-environment]
...
@@ -175,6 +175,7 @@ recipe = collective.recipe.template
...
@@ -175,6 +175,7 @@ recipe = collective.recipe.template
input = inline:#!/bin/bash
input = inline:#!/bin/bash
umask 022
umask 022
export HOME=${buildout:directory}
export HOME=${buildout:directory}
export SLAP_DEPLOY_IP={{ ipv4 }}
# include .bashrc if it exists
# include .bashrc if it exists
if [ -f ~/.bashrc ]; then
if [ -f ~/.bashrc ]; then
...
...
software/proviewR/software.cfg
View file @
27339209
...
@@ -68,7 +68,7 @@ mode = 0644
...
@@ -68,7 +68,7 @@ mode = 0644
[template-proview-r]
[template-proview-r]
<= download-base
<= download-base
md5sum =
b1f31e7f5f9d6eab35842dac5e5697a4
md5sum =
c6570f720fe924616f65ec7f36c373ba
filename = instance-proview-r.cfg.jinja2.in
filename = instance-proview-r.cfg.jinja2.in
[template-pwrp-profile]
[template-pwrp-profile]
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment