Commit 41bf0d3a authored by Antoine Fontaine's avatar Antoine Fontaine
Browse files

community/anbox: repair LXC4 breakage

parent 048dbb01
Pipeline #81805 passed with stages
in 11 minutes and 38 seconds
......@@ -4,7 +4,7 @@
# Maintainer: Antoine Fontaine <antoine.fontaine@epfl.ch>
pkgname=anbox
pkgver=0_git20210331
pkgrel=3
pkgrel=4
_commit="9de4e87cdd05135e1c71e6eadb68bf82719cebdf"
_cpu_features_version="0.6.0"
pkgdesc="Android in a box"
......@@ -50,6 +50,7 @@ source="
https://github.com/ubports/anbox/commit/e34b59513422eb905b53d7dc6c0862cea535eb96.patch
anbox-launch.sh
anbox.desktop
lxc4.patch
"
builddir="$srcdir/$pkgname-$_commit"
......@@ -109,7 +110,8 @@ package() {
"$pkgdir"/usr/share/anbox/anbox-shell.sh
}
sha512sums="89d31043047c1e25b2789638dddd5ea49d9fd754e0baa573c073c3c454e3a6e6f1e3bea6e4a632d6c3942d3a206741bc62f7db6e435c8be34856915dc4b27464 anbox-9de4e87cdd05135e1c71e6eadb68bf82719cebdf.tar.gz
sha512sums="
89d31043047c1e25b2789638dddd5ea49d9fd754e0baa573c073c3c454e3a6e6f1e3bea6e4a632d6c3942d3a206741bc62f7db6e435c8be34856915dc4b27464 anbox-9de4e87cdd05135e1c71e6eadb68bf82719cebdf.tar.gz
006a2e05253712cf605ecabccdda63dd9325445f8d145d5e2432c4342332e652f318810997321849be131082db435d88143020fdc85268fba204586cf37eef0d cpu_features-v0.6.0.tar.gz
959058eb1c1e3eb0d1593695ee57fbc0cc567f260235e81d7b56da62b0b80fca9112d5f16a1e1c5c0e6223c8a1899f97f906c7cc763dc015e094aacded818a2f anbox-container-manager.initd
6a3bc88142c5287ec54d481a4788eceb7772d9974af950b5286ce63a49d05d9d49fce5ba1d02b4b1c9893896fd4ba218fd4d39b8e640bdd61ad196b5d5c9a021 anbox.confd
......@@ -118,4 +120,6 @@ c2b4ca0ff20df005abfbaa457d40ae65d3979353b1868fbfebff1c0527d1df71c5684a6b7dc9d71f
0f6324231028d32467dc95d43ed4865c29fde3396524479f514533e079179b0b068f1b38cbdf227af13d64ab117a27f3b962d8a99f5ecacf3fff4302d3ffe702 give-more-time-to-start.patch
049ef6e5d02bc1bb39c24d623b00c048443cfaba72637a22d27e202a42731d8e9e71cccd59c8f7dafc1816f1fd4508d337ec75f59891ebbdadc275b2daba466f e34b59513422eb905b53d7dc6c0862cea535eb96.patch
921d69e28a2f63a6eaccdfbd6f53173d2e0c59dd650dd83c0d8f816b5f23f1ba61abb393b0cf5e48d80ce363df4f3e609de34a4e5a73c2b520dba96b76eda0c9 anbox-launch.sh
3e458e6215ecf0ac94d749f4d78e464850dcf2cc2b616b2f7ddf26e9617d63a90bd0c8be59e4540141a813af4bad84d0f84874105f7ef9de8149666fc3828da7 anbox.desktop"
3e458e6215ecf0ac94d749f4d78e464850dcf2cc2b616b2f7ddf26e9617d63a90bd0c8be59e4540141a813af4bad84d0f84874105f7ef9de8149666fc3828da7 anbox.desktop
dea7a84263e4941faeb9d8f42d2180adfc67d4f9cf3f7660f6028614aad1a73fd3fdab29c1f0371991aeda05bce31471da970f29f848894ab3ef0059d6f93ec7 lxc4.patch
"
--- a/src/anbox/container/lxc_container.cpp
+++ b/src/anbox/container/lxc_container.cpp
@@ -343,8 +343,10 @@ void LxcContainer::start(const Configura
set_config_item(lxc_config_tty_max_key, "0");
set_config_item(lxc_config_uts_name_key, "anbox");
- set_config_item("lxc.group.devices.deny", "");
- set_config_item("lxc.group.devices.allow", "");
+ set_config_item("lxc.cgroup.devices.deny", "");
+ set_config_item("lxc.cgroup.devices.allow", "");
+ set_config_item("lxc.cgroup2.devices.deny", "");
+ set_config_item("lxc.cgroup2.devices.allow", "");
// We can't move bind-mounts, so don't use /dev/lxc/
set_config_item(lxc_config_tty_dir_key, "");
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment