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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
isaak yansane-sisk
slapos
Commits
c73c6251
Commit
c73c6251
authored
Nov 09, 2011
by
Cédric de Saint Martin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update kvm source code, add missing pkgconfig binary path
parent
9921b8f4
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
5 deletions
+8
-5
software/kvm/software.cfg
software/kvm/software.cfg
+4
-4
stack/kvm.cfg
stack/kvm.cfg
+4
-1
No files found.
software/kvm/software.cfg
View file @
c73c6251
...
@@ -9,10 +9,10 @@ md5sum = 298b146e4efce41bfd58b3f85d064ff1
...
@@ -9,10 +9,10 @@ md5sum = 298b146e4efce41bfd58b3f85d064ff1
output = ${buildout:directory}/template.cfg
output = ${buildout:directory}/template.cfg
mode = 0644
mode = 0644
[kvmsource]
#
[kvmsource]
command =
#
command =
(${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} && cd ${:location} && ${git:location}/bin/git reset --hard 94ee45cc02e69798cac8209d2296fd1751125018) || (rm -fr ${:location} ; exit 1)
#
(${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} && cd ${:location} && ${git:location}/bin/git reset --hard 94ee45cc02e69798cac8209d2296fd1751125018) || (rm -fr ${:location} ; exit 1)
update-command =
#
update-command =
[versions]
[versions]
zc.buildout = 1.5.3-dev-SlapOS-010
zc.buildout = 1.5.3-dev-SlapOS-010
...
...
stack/kvm.cfg
View file @
c73c6251
[buildout]
[buildout]
develop = /root/websockify
extends =
extends =
shacache-client.cfg
shacache-client.cfg
../component/python-2.7/buildout.cfg
../component/python-2.7/buildout.cfg
...
@@ -98,6 +99,7 @@ configure-options =
...
@@ -98,6 +99,7 @@ configure-options =
--extra-ldflags="-Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
--extra-ldflags="-Wl,-rpath -Wl,${gnutls:location}/lib -L${gnutls:location}/lib -Wl,-rpath -Wl,${libpng:location}/lib -L${libpng:location}/lib -L${libuuid:location}/lib -Wl,-rpath -Wl,${libuuid:location}/lib -L${zlib:location}/lib -Wl,-rpath -Wl,${zlib:location}/lib -lpng -lz -lgnutls"
--disable-werror
--disable-werror
environment =
environment =
PATH=${pkgconfig:location}/bin:%(PATH)s
PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig
PKG_CONFIG_PATH=${gnutls:location}/lib/pkgconfig
[kvmsource]
[kvmsource]
...
@@ -105,8 +107,9 @@ recipe=plone.recipe.command
...
@@ -105,8 +107,9 @@ recipe=plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
stop-on-error = true
#tag = slapos-v0.1
#tag = slapos-v0.1
branch = upstream
command =
command =
(${git:location}/bin/git clone --quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
(${git:location}/bin/git clone -
b ${:branch} -
-quiet http://git.erp5.org/repos/slapos.kvm.git ${:location} ) || (rm -fr ${:location} ; exit 1)
update-command =
update-command =
cd ${:location} && ${git:location}/bin/git pull --quiet origin master
cd ${:location} && ${git:location}/bin/git pull --quiet origin master
...
...
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