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
Labels
Merge Requests
103
Merge Requests
103
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
nexedi
slapos
Commits
63452da0
Commit
63452da0
authored
Mar 22, 2023
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
6084e045
81b9feb2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
5 deletions
+14
-5
component/firewalld/buildout.cfg
component/firewalld/buildout.cfg
+4
-4
component/liburing/buildout.cfg
component/liburing/buildout.cfg
+9
-0
stack/slapos.cfg
stack/slapos.cfg
+1
-1
No files found.
component/firewalld/buildout.cfg
View file @
63452da0
...
@@ -117,6 +117,7 @@ python = ${buildout:bin-directory}/${firewalld-eggs:interpreter}
...
@@ -117,6 +117,7 @@ python = ${buildout:bin-directory}/${firewalld-eggs:interpreter}
stop-on-error = True
stop-on-error = True
command =
command =
set -e
set -e
set -x
sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-applet
sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-applet
sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-cmd
sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-cmd
sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-config
sed -i 's#python3#${:python}#' ${firewalld:location}/bin/firewall-config
...
@@ -139,10 +140,9 @@ command =
...
@@ -139,10 +140,9 @@ command =
echo -n '#!/bin/sh\nLD_LIBRARY_PATH=${nftables:location}/lib exec ${firewalld:location}/${firewalld:sbin-dir}/firewalld "$@"' > ${firewalld:location}/sbin/firewalld
echo -n '#!/bin/sh\nLD_LIBRARY_PATH=${nftables:location}/lib exec ${firewalld:location}/${firewalld:sbin-dir}/firewalld "$@"' > ${firewalld:location}/sbin/firewalld
chmod a+x ${firewalld:location}/sbin/firewalld
chmod a+x ${firewalld:location}/sbin/firewalld
# no need to patch dbus if not in top level compilation
# the following 2 commands may fail in a Theia environment because we don't have write permission on a shared folder
[ "$(stat -c '%U' ${dbus:location}/share/dbus-1/system.conf)" = "slapsoft" ] || exit 0
sed -i 's#<user>messagebus</user>#<user>slapsoft</user>#' ${dbus:location}/share/dbus-1/system.conf || true
sed -i 's#<user>messagebus</user>#<user>slapsoft</user>#' ${dbus:location}/share/dbus-1/system.conf
cp -f ${firewalld:location}/share/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/ || true
cp -f ${firewalld:location}/share/dbus-1/system.d/FirewallD.conf ${dbus:location}/share/dbus-1/system.d/
update-command = ${:command}
update-command = ${:command}
stop-on-error = true
stop-on-error = true
...
...
component/liburing/buildout.cfg
View file @
63452da0
...
@@ -7,3 +7,12 @@ recipe = slapos.recipe.cmmi
...
@@ -7,3 +7,12 @@ recipe = slapos.recipe.cmmi
shared = true
shared = true
url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.3.tar.gz
url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.3.tar.gz
md5sum = 2e8c3c23795415475654346484f5c4b8
md5sum = 2e8c3c23795415475654346484f5c4b8
# liburing 2.3 needs at least kernel 4.14 because it uses SO_ZEROCOPY
# see https://github.com/axboe/liburing/blob/liburing-2.3/CHANGELOG#L13
# see https://kernelnewbies.org/Linux_4.14#Zero-copy_from_user_memory_to_sockets
[liburing:[int(q) for q in platform.release().split("-")[0].split(".")]<[4,14,0]]
recipe = slapos.recipe.cmmi
shared = true
url = https://github.com/axboe/liburing/archive/refs/tags/liburing-2.2.tar.gz
md5sum = 9075595460c86646a7239e3110ec0dd5
stack/slapos.cfg
View file @
63452da0
...
@@ -295,7 +295,7 @@ simplegeneric = 0.8.1
...
@@ -295,7 +295,7 @@ simplegeneric = 0.8.1
singledispatch = 3.4.0.3
singledispatch = 3.4.0.3
six = 1.16.0
six = 1.16.0
slapos.cookbook = 1.0.305
slapos.cookbook = 1.0.305
slapos.core = 1.9.
0
slapos.core = 1.9.
1
slapos.extension.shared = 1.0
slapos.extension.shared = 1.0
slapos.libnetworkcache = 0.25
slapos.libnetworkcache = 0.25
slapos.rebootstrap = 4.5
slapos.rebootstrap = 4.5
...
...
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