Skip to content

Commit

Permalink
deps/softwarecontainer-dependencies.sh: Fix lxc and python3-lxc insta…
Browse files Browse the repository at this point in the history
…llation

Remove unneeded LXC packages

Install python3-lxc from source

Signed-off-by: Alexander Livenets <[email protected]>
  • Loading branch information
Alexander Livenets committed Apr 13, 2020
1 parent 0ee5a47 commit d5778cf
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 4 deletions.
2 changes: 1 addition & 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 Down
17 changes: 14 additions & 3 deletions deps/softwarecontainer-dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,16 +44,27 @@ 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

make && make install

cd ../

# Download and install python3-lxc
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

0 comments on commit d5778cf

Please sign in to comment.