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
Eric Zheng
slapos
Commits
56301b8e
Commit
56301b8e
authored
May 21, 2021
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Plain Diff
Update Release Candidate
parents
b9b5fc89
97fc9194
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
5 deletions
+7
-5
component/fish-shell/buildout.cfg
component/fish-shell/buildout.cfg
+4
-2
software/kvm/buildout.hash.cfg
software/kvm/buildout.hash.cfg
+1
-1
software/kvm/template/template-kvm-run.in
software/kvm/template/template-kvm-run.in
+2
-2
No files found.
component/fish-shell/buildout.cfg
View file @
56301b8e
...
@@ -9,12 +9,13 @@ extends =
...
@@ -9,12 +9,13 @@ extends =
../ncurses/buildout.cfg
../ncurses/buildout.cfg
../readline/buildout.cfg
../readline/buildout.cfg
../gettext/buildout.cfg
../gettext/buildout.cfg
../xz-utils/buildout.cfg
[fish-shell]
[fish-shell]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
shared = true
shared = true
url = https://github.com/fish-shell/fish-shell/releases/download/3.
1.0/fish-3.1.0.tar.g
z
url = https://github.com/fish-shell/fish-shell/releases/download/3.
2.2/fish-3.2.2.tar.x
z
md5sum =
8c9995a5a6d07ce05a1413ca24e1669
1
md5sum =
606253699ce41991b03a93bcc6047d5
1
configure-command = ${cmake:location}/bin/cmake
configure-command = ${cmake:location}/bin/cmake
configure-options =
configure-options =
-DCMAKE_INSTALL_PREFIX=${:location}
-DCMAKE_INSTALL_PREFIX=${:location}
...
@@ -26,6 +27,7 @@ environment =
...
@@ -26,6 +27,7 @@ environment =
CMAKE_INCLUDE_PATH=${bzip2:location}/include:${zlib:location}/include:${ncurses:location}/include:${gettext:location}/include:${readline:location}/include
CMAKE_INCLUDE_PATH=${bzip2:location}/include:${zlib:location}/include:${ncurses:location}/include:${gettext:location}/include:${readline:location}/include
CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH}
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
LDFLAGS=-L${ncurses:location}/lib -Wl,-rpath=${ncurses:location}/lib -L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
PATH=${xz-utils:location}/bin/:%(PATH)s
CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include
CMAKE_CFLAGS = -I${bzip2:location}/include -I${zlib:location}/include -I${ncurses:location}/include -I${gettext:location}/include -I${readline:location}/include
CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib
CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${zlib:location}/lib:${ncurses:location}/lib:${gettext:location}/lib:${readline:location}/lib
...
...
software/kvm/buildout.hash.cfg
View file @
56301b8e
...
@@ -55,7 +55,7 @@ md5sum = b7e87479a289f472b634a046b44b5257
...
@@ -55,7 +55,7 @@ md5sum = b7e87479a289f472b634a046b44b5257
[template-kvm-run]
[template-kvm-run]
filename = template/template-kvm-run.in
filename = template/template-kvm-run.in
md5sum = b
3945eb1491120117c75a16b098a46ad
md5sum = b
e750fb62f7057c97dd6c6887b2149cc
[template-kvm-controller]
[template-kvm-controller]
filename = template/kvm-controller-run.in
filename = template/kvm-controller-run.in
...
...
software/kvm/template/template-kvm-run.in
View file @
56301b8e
...
@@ -64,8 +64,8 @@ for disk_device_path in '{{ parameter_dict.get("disk-device-path", "") }}'.split
...
@@ -64,8 +64,8 @@ for disk_device_path in '{{ parameter_dict.get("disk-device-path", "") }}'.split
disk_info_list.append({
disk_info_list.append({
'path': disk_device_path,
'path': disk_device_path,
'format': "raw",
'format': "raw",
'aio':
{{ parameter_dict['disk-aio'] or "native" }}
,
'aio':
"{{ parameter_dict['disk-aio'] or 'native' }}"
,
'cache':
{{ parameter_dict['disk-cache'] or "none" }}
,
'cache':
"{{ parameter_dict['disk-cache'] or 'none' }}"
,
})
})
if not disk_info_list:
if not disk_info_list:
...
...
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