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
Klaus Wölfel
slapos
Commits
d80ab8d9
Commit
d80ab8d9
authored
Feb 04, 2014
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add cups, dbus, dbus-glib and glib in cloudooo's LD_LIBRARY_PATH.
parent
f57d5818
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
63 additions
and
6 deletions
+63
-6
component/cups/buildout.cfg
component/cups/buildout.cfg
+32
-0
software/cloudooo/instance-cloudoo.cfg.in
software/cloudooo/instance-cloudoo.cfg.in
+1
-1
software/cloudooo/instance.cfg.in
software/cloudooo/instance.cfg.in
+4
-0
software/cloudooo/software.cfg
software/cloudooo/software.cfg
+6
-2
stack/cloudooo.cfg
stack/cloudooo.cfg
+7
-0
stack/erp5/buildout.cfg
stack/erp5/buildout.cfg
+8
-2
stack/erp5/instance-cloudoo.cfg.in
stack/erp5/instance-cloudoo.cfg.in
+1
-1
stack/erp5/instance.cfg.in
stack/erp5/instance.cfg.in
+4
-0
No files found.
component/cups/buildout.cfg
0 → 100644
View file @
d80ab8d9
[buildout]
extends =
../zlib/buildout.cfg
parts =
cups
# for now we build and install library and header files only.
[cups]
recipe = slapos.recipe.cmmi
url = http://www.cups.org/software/1.7.1/cups-1.7.1-source.tar.bz2
md5sum = 55277c40fd4b7183dc3671d39c5c42b7
configure-options =
--disable-static
--disable-dbus
--disable-gssapi
--disable-ssl
--disable-pam
--disable-avahi
--disable-dnssd
--disable-launchd
--disable-browsing
--disable-default-shared
--disable-raw-printing
--disable-webif
make-options =
libs
make-targets =
install-headers
install-libs
environment =
CPPFLAGS=-I${zlib:location}/include
DSOFLAGS=-L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
software/cloudooo/instance-cloudoo.cfg.in
View file @
d80ab8d9
...
@@ -19,7 +19,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
...
@@ -19,7 +19,7 @@ url = cloudooo://${haproxy:ip}:${haproxy:port}/
recipe = slapos.cookbook:generic.cloudooo
recipe = slapos.cookbook:generic.cloudooo
ip = {{ ipv4 }}
ip = {{ ipv4 }}
environment =
environment =
LD_LIBRARY_PATH = {{ parameter_dict['
file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype
'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
LD_LIBRARY_PATH = {{ parameter_dict['
cups'] }}/lib:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib
'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
PATH = ${binary-link:target-directory}
PATH = ${binary-link:target-directory}
# Binary information
# Binary information
...
...
software/cloudooo/instance.cfg.in
View file @
d80ab8d9
...
@@ -25,9 +25,13 @@ context =
...
@@ -25,9 +25,13 @@ context =
${:extra-context}
${:extra-context}
[dynamic-template-cloudooo-parameters]
[dynamic-template-cloudooo-parameters]
cups = {{ cups_location }}
dbus = {{ dbus_location }}
dbus-glib = {{ dbus_glib_location }}
file = {{ file_location }}
file = {{ file_location }}
fontconfig = {{ fontconfig_location }}
fontconfig = {{ fontconfig_location }}
freetype = {{ freetype_location }}
freetype = {{ freetype_location }}
glib = {{ glib_location }}
haproxy = {{ haproxy_location }}
haproxy = {{ haproxy_location }}
libffi = {{ libffi_location }}
libffi = {{ libffi_location }}
libICE = {{ libICE_location }}
libICE = {{ libICE_location }}
...
...
software/cloudooo/software.cfg
View file @
d80ab8d9
...
@@ -62,15 +62,19 @@ context =
...
@@ -62,15 +62,19 @@ context =
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
e265d99e1a5baacf7cd6a4d2b1193b1a
md5sum =
1c5dab821393845b118644686154710f
extra-context =
extra-context =
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key cups_location cups:location
key dbus_location dbus:location
key dbus_glib_location dbus-glib:location
key dcron_location dcron:location
key dcron_location dcron:location
key file_location file:location
key file_location file:location
key fontconfig_location fontconfig:location
key fontconfig_location fontconfig:location
key fonts_location fonts:location
key fonts_location fonts:location
key freetype_location freetype:location
key freetype_location freetype:location
key git_location git:location
key git_location git:location
key glib_location glib:location
key haproxy_location haproxy:location
key haproxy_location haproxy:location
key imagemagick_location imagemagick:location
key imagemagick_location imagemagick:location
key libICE_location libICE:location
key libICE_location libICE:location
...
@@ -93,7 +97,7 @@ extra-context =
...
@@ -93,7 +97,7 @@ extra-context =
[template-cloudooo]
[template-cloudooo]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum = 6
dca19a1aba5bac7c6029bde4e997cb9
md5sum = 6
7dd8fc6c5732393fdaf4a92edf2c853
mode = 640
mode = 640
[networkcache]
[networkcache]
...
...
stack/cloudooo.cfg
View file @
d80ab8d9
...
@@ -33,6 +33,9 @@ allow-hosts =
...
@@ -33,6 +33,9 @@ allow-hosts =
bitbucket.org
bitbucket.org
extends =
extends =
../component/cups/buildout.cfg
../component/dbus/buildout.cfg
../component/glib/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/libreoffice-bin/buildout.cfg
../component/libffi/buildout.cfg
../component/libffi/buildout.cfg
../component/libpng/buildout.cfg
../component/libpng/buildout.cfg
...
@@ -72,6 +75,10 @@ parts =
...
@@ -72,6 +75,10 @@ parts =
ocrb-fonts
ocrb-fonts
# Dependencies
# Dependencies
cups
dbus
dbus-glib
glib
libffi
libffi
libpng12
libpng12
imagemagick
imagemagick
...
...
stack/erp5/buildout.cfg
View file @
d80ab8d9
...
@@ -22,6 +22,8 @@ extends =
...
@@ -22,6 +22,8 @@ extends =
https://raw.github.com/zopefoundation/Zope/2.13.21/versions.cfg
https://raw.github.com/zopefoundation/Zope/2.13.21/versions.cfg
../../stack/slapos.cfg
../../stack/slapos.cfg
../../component/logrotate/buildout.cfg
../../component/logrotate/buildout.cfg
../../component/cups/buildout.cfg
../../component/dbus/buildout.cfg
../../component/dcron/buildout.cfg
../../component/dcron/buildout.cfg
../../component/file/buildout.cfg
../../component/file/buildout.cfg
../../component/fonts/buildout.cfg
../../component/fonts/buildout.cfg
...
@@ -210,7 +212,7 @@ mode = 640
...
@@ -210,7 +212,7 @@ mode = 640
[template-cloudooo]
[template-cloudooo]
recipe = slapos.recipe.build:download
recipe = slapos.recipe.build:download
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
url = ${:_profile_base_location_}/instance-cloudoo.cfg.in
md5sum =
c3d7d9e1eaf467d05c424daca5011081
md5sum =
34b504982bf3b28c42aae06e7f0c0d99
mode = 640
mode = 640
[template-zope-conf]
[template-zope-conf]
...
@@ -224,14 +226,17 @@ mode = 640
...
@@ -224,14 +226,17 @@ mode = 640
# XXX: "template.cfg" is hardcoded in instanciation recipe
# XXX: "template.cfg" is hardcoded in instanciation recipe
filename = template.cfg
filename = template.cfg
template = ${:_profile_base_location_}/instance.cfg.in
template = ${:_profile_base_location_}/instance.cfg.in
md5sum =
38c825de068267aa6f614dba23f894aa
md5sum =
66a1be44c72437d87a7b609eb58c3526
extra-context =
extra-context =
key apache_location apache:location
key apache_location apache:location
key aspell_location aspell:location
key aspell_location aspell:location
key buildout_bin_directory buildout:bin-directory
key buildout_bin_directory buildout:bin-directory
key coreutils_location coreutils:location
key coreutils_location coreutils:location
key cups_location cups:location
key curl_location curl:location
key curl_location curl:location
key dash_location dash:location
key dash_location dash:location
key dbus_location dbus:location
key dbus_glib_location dbus-glib:location
key dcron_location dcron:location
key dcron_location dcron:location
key dmtx_utils_location dmtx-utils:location
key dmtx_utils_location dmtx-utils:location
key erp5_location erp5:location
key erp5_location erp5:location
...
@@ -242,6 +247,7 @@ extra-context =
...
@@ -242,6 +247,7 @@ extra-context =
key git_location git:location
key git_location git:location
key graphviz_location graphviz:location
key graphviz_location graphviz:location
key grep_location grep:location
key grep_location grep:location
key glib_location glib:location
key gzip_location gzip:location
key gzip_location gzip:location
key haproxy_location haproxy:location
key haproxy_location haproxy:location
key imagemagick_location imagemagick:location
key imagemagick_location imagemagick:location
...
...
stack/erp5/instance-cloudoo.cfg.in
View file @
d80ab8d9
...
@@ -31,7 +31,7 @@ wrapper = ${directory:service}/cloudooo
...
@@ -31,7 +31,7 @@ wrapper = ${directory:service}/cloudooo
data-directory = ${directory:cloudooo-data}
data-directory = ${directory:cloudooo-data}
environment =
environment =
LD_LIBRARY_PATH = {{ parameter_dict['
file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype
'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
LD_LIBRARY_PATH = {{ parameter_dict['
cups'] }}/lib:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['glib
'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['zlib'] }}/lib
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
FONTCONFIG_FILE = ${fontconfig-instance:conf-path}
# Binary information
# Binary information
...
...
stack/erp5/instance.cfg.in
View file @
d80ab8d9
...
@@ -68,9 +68,13 @@ extra-context =
...
@@ -68,9 +68,13 @@ extra-context =
raw software_type tidstorage
raw software_type tidstorage
[dynamic-template-cloudooo-parameters]
[dynamic-template-cloudooo-parameters]
cups = {{ cups_location }}
dbus = {{ dbus_location }}
dbus-glib = {{ dbus_glib_location }}
file = {{ file_location }}
file = {{ file_location }}
fontconfig = {{ fontconfig_location }}
fontconfig = {{ fontconfig_location }}
freetype = {{ freetype_location }}
freetype = {{ freetype_location }}
glib = {{ glib_location }}
libffi = {{ libffi_location }}
libffi = {{ libffi_location }}
libICE = {{ libICE_location }}
libICE = {{ libICE_location }}
libpng12 = {{ libpng12_location }}
libpng12 = {{ libpng12_location }}
...
...
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