Use upstream lxc instead of patched one

This commit is contained in:
Simon Fels 2017-04-08 13:55:13 +02:00
commit 4162e4b7b5

View file

@ -36,8 +36,9 @@ parts:
stage-packages: stage-packages:
- apparmor - apparmor
lxc: lxc:
source: git://github.com/morphis/lxc source: https://github.com/lxc/lxc
source-branch: snappy-support source-type: git
source-tag: lxc-2.0.7
build-packages: build-packages:
- libapparmor-dev - libapparmor-dev
- libcap-dev - libcap-dev
@ -55,16 +56,14 @@ parts:
- --disable-api-docs - --disable-api-docs
- --disable-bash - --disable-bash
- --disable-cgmanager - --disable-cgmanager
# FIXME: Enable again once stacked AppArmor support has landed
- --disable-apparmor - --disable-apparmor
- --disable-seccomp - --disable-seccomp
- --enable-capabilities - --enable-capabilities
- --with-rootfs-path=/var/snap/anbox/common/lxc/ - --with-rootfs-path=/var/snap/anbox/common/lxc/
- --libexecdir=/snap/anbox/current/libexec/
organize:
snap/anbox/current/libexec: libexec
prime: prime:
- bin/lxc-attach
- bin/lxc-ls
- bin/lxc-start
- bin/lxc-stop
- lib/liblxc.so.1 - lib/liblxc.so.1
- lib/liblxc.so.1.2.0 - lib/liblxc.so.1.2.0
- libexec/lxc/lxc-monitord - libexec/lxc/lxc-monitord