Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

deps/softwarecontainer-dependencies.sh: Fix lxc and python3-lxc insta… #104

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion deps/pytest-and-dbus-testing-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function install {
}

# Install both python2 and python3 versions
install python3-dbus python3-pip python3-lxc
install python3-dbus python3-pip
install python-gobject python-dbus python-pip

pip install pydbus
Expand All @@ -57,3 +57,11 @@ pip3 install pydbus
pip3 install pytest
pip3 install psutil

# Download and install python3-lxc manually.
# python3-lxc Ubuntu package depends on LXC packages, therefore LXC of
# conflicting version will be installed
rm -rf python3-lxc
git clone git://github.com/lxc/python3-lxc -b python3-lxc-3.0.4
cd python3-lxc

python3 ./setup.py install
8 changes: 5 additions & 3 deletions deps/softwarecontainer-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,18 @@ function install {
# For softwarecontainer
install libdbus-1-dev libglibmm-2.4-dev libglibmm-2.4 \
unzip bridge-utils lcov libjansson-dev libjansson4 \
dbus-x11 libcap-dev libtool python3-dev
dbus-x11 libcap-dev libtool python3-dev \
seccomp libseccomp-dev

apt-get remove --allow-downgrades --allow-remove-essential --allow-change-held-packages -fuy lxcfs lxc2 lxc-dev lxc-common
apt-get remove --allow-downgrades --allow-remove-essential --allow-change-held-packages -fuy lxcfs lxc2 lxc-dev lxc-common \
liblxc-common liblxc-dev lxc1 liblxc1 lxc-templates lxc-tests lxc-utils python3-lxc

# Download and install lxc
rm -rf lxc
git clone git://github.com/lxc/lxc -b lxc-3.1.0
cd lxc

./autogen.sh
./configure --prefix=/usr --enable-capabilities --enable-python
./configure --prefix=/usr --enable-capabilities --enable-python --enable-apparmor --enable-seccomp
JEderonn marked this conversation as resolved.
Show resolved Hide resolved

make && make install