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
Ophélie Gagnard
slapos
Commits
4b28ab13
Commit
4b28ab13
authored
Apr 15, 2022
by
Thomas Gambier
🚴🏼
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos-node package uses python3
parent
a6abf8f0
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
15 deletions
+7
-15
component/firewalld/buildout.cfg
component/firewalld/buildout.cfg
+1
-1
component/python-slip/buildout.cfg
component/python-slip/buildout.cfg
+2
-11
component/slapos/obs.cfg
component/slapos/obs.cfg
+4
-3
No files found.
component/firewalld/buildout.cfg
View file @
4b28ab13
...
@@ -60,7 +60,7 @@ environment =
...
@@ -60,7 +60,7 @@ environment =
DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
DBUS_GLIB_CFLAGS=-I${dbus-glib:location}/include/dbus-1.0
DBUS_GLIB_LIBS=-L${dbus-glib:location}/lib -ldbus-glib-1
DBUS_GLIB_LIBS=-L${dbus-glib:location}/lib -ldbus-glib-1
CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
CPPFLAGS=-I${glib:location}/include/glib-2.0 -I${glib:location}/lib/glib-2.0/include
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
LDFLAGS=-L${glib:location}/lib -Wl,-rpath=${glib:location}/lib
-L${gettext:location}/lib -Wl,-rpath=${gettext:location}/lib
[gobject-introspection]
[gobject-introspection]
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
...
...
component/python-slip/buildout.cfg
View file @
4b28ab13
...
@@ -6,27 +6,19 @@ parts =
...
@@ -6,27 +6,19 @@ parts =
[python-slip]
[python-slip]
# BUG: This section does FS changes outside location.
# BUG: This section does FS changes outside location.
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.
1/python-slip-0.6.1
.tar.bz2
url = https://github.com/nphilipp/python-slip/releases/download/python-slip-0.6.
5/python-slip-0.6.5
.tar.bz2
md5sum =
a6d8ee96245fc21785d4c1c062c85f2f
md5sum =
28ae5f93853466c44ec96706ba2a1eb4
configure-command = true
configure-command = true
make-targets =
make-targets =
make-binary =
make-binary =
make all
make all
cp -ax . ${:slip}/
cp -ax . ${:slip}/
cp -ax . ${:slip.dbus}/
cp -ax . ${:slip.dbus}/
cp -ax . ${:slip.gtk}/
sed -i '/setup(name="slip.dbus"/,/"gtk", "pango"])/d' ${:slip}/setup.py
sed -i '/setup(name="slip.dbus"/,/"gtk", "pango"])/d' ${:slip}/setup.py
sed -i '/setup(name="slip"/,/selinux"])/d' ${:slip.dbus}/setup.py
sed -i '/setup(name="slip"/,/selinux"])/d' ${:slip.dbus}/setup.py
sed -i '/if sys.version_info.major/,/"gtk", "pango"])/d' ${:slip.dbus}/setup.py
sed -i '/if sys.version_info.major/,/"gtk", "pango"])/d' ${:slip.dbus}/setup.py
sed -i '/setup(name="slip"/,/xml.etree.ElementTree"])/d' ${:slip.gtk}/setup.py
slip = ${buildout:parts-directory}/slip
slip = ${buildout:parts-directory}/slip
slip.dbus = ${buildout:parts-directory}/slip.dbus
slip.dbus = ${buildout:parts-directory}/slip.dbus
slip.gtk = ${buildout:parts-directory}/slip.gtk
[slip.gtk-develop]
recipe = zc.recipe.egg:develop
setup = ${python-slip:slip.gtk}
egg-name = slip.gtk
[slip.dbus-develop]
[slip.dbus-develop]
recipe = zc.recipe.egg:develop
recipe = zc.recipe.egg:develop
...
@@ -43,5 +35,4 @@ recipe = zc.recipe.egg
...
@@ -43,5 +35,4 @@ recipe = zc.recipe.egg
eggs =
eggs =
${slip-develop:egg-name}
${slip-develop:egg-name}
${slip.dbus-develop:egg-name}
${slip.dbus-develop:egg-name}
${slip.gtk-develop:egg-name}
component/slapos/obs.cfg
View file @
4b28ab13
...
@@ -26,13 +26,14 @@ extends-cache = extends-cache
...
@@ -26,13 +26,14 @@ extends-cache = extends-cache
download-cache = download-cache
download-cache = download-cache
[python]
[python]
part = python3
init +=
init +=
buildout = self.buildout['buildout']
buildout = self.buildout['buildout']
assert buildout['directory'] == buildout['destdir'] + buildout['rootdir'], (
assert buildout['directory'] == buildout['destdir'] + buildout['rootdir'], (
"Buildout MUST BE launched in destdir/rootdir (currently launched in %s but should be launched in %s)",
"Buildout MUST BE launched in destdir/rootdir (currently launched in %s but should be launched in %s)",
buildout['directory'], buildout['destdir'] + buildout['rootdir'])
buildout['directory'], buildout['destdir'] + buildout['rootdir'])
[python
2.7
]
[python
3-common
]
configure-options +=
configure-options +=
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
--prefix=${buildout:rootdir}/parts/${:_buildout_section_name_}
environment +=
environment +=
...
@@ -86,8 +87,8 @@ pre-configure =
...
@@ -86,8 +87,8 @@ pre-configure =
environment +=
environment +=
LD_LIBRARY_PATH=${dbus:location}/lib
LD_LIBRARY_PATH=${dbus:location}/lib
PYTHON=${python:location}/bin/python${python:version}
PYTHON=${python:location}/bin/python${python:version}
PYTHON_INCLUDES=-I${python:location}/include/python${python:version}
PYTHON_INCLUDES=-I${python:location}/include/python${python:version}
m
PYTHON_LIBS=-L${python:location}/lib -lpython${python:version} -lpthread -ldl -lutil -lm
PYTHON_LIBS=-L${python:location}/lib -lpython${python:version}
m
-lpthread -ldl -lutil -lm
post-install =
post-install =
sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
sed -i 's#${dbus:location}/lib/libdbus-1.la#/opt/slapos/parts/dbus/lib/libdbus-1.la#' ${dbus-glib:location}/lib/libdbus-glib-1.la
...
...
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