src_prepare/src_prepare-overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
app-emulation/anbox: fix systemd service and LXC patch

See merge request src_prepare/src_prepare-overlay!238
This commit is contained in:
Parona 2021-11-23 20:32:54 +00:00
commit 3e0dca86a7
4 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app-emulation/anbox/anbox-0_pre20201129.ebuild
View File

@ -60,7 +60,7 @@ CONFIG_CHECK="
~TMPFS_XATTR ~TMPFS_XATTR
" "
PATCHES=( ""${FILESDIR}"/no_bundled_sdbus.patch" ) PATCHES=( ""${FILESDIR}"/no_bundled_sdbus.patch" ""${FILESDIR}"/lxc.patch" )
pkg_pretend() { pkg_pretend() {
if use !systemd; then if use !systemd; then
@ -95,7 +95,8 @@ src_install() {
cmake_src_install cmake_src_install
newbin "${FILESDIR}"/anbox-launch.sh anbox-launch newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
if use systemd; then if use systemd; then
systemd_dounit "${FILESDIR}"/anbox-{{container,session}-manager.service,bridge.net{dev,work}} systemd_dounit "${FILESDIR}"/anbox-{container-manager.service,bridge.net{dev,work}}
systemd_douserunit "${FILESDIR}"/anbox-session-manager.service
else else
exeinto /usr/share/anbox exeinto /usr/share/anbox
doexe "scripts/anbox-bridge.sh" doexe "scripts/anbox-bridge.sh"

5
app-emulation/anbox/anbox-0_pre20210320.ebuild
View File

@ -60,7 +60,7 @@ CONFIG_CHECK="
~TMPFS_XATTR ~TMPFS_XATTR
" "
PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" ) PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" ""${FILESDIR}"/lxc.patch" )
pkg_pretend() { pkg_pretend() {
if use !systemd; then if use !systemd; then
@ -97,7 +97,8 @@ src_install() {
cmake_src_install cmake_src_install
newbin "${FILESDIR}"/anbox-launch.sh anbox-launch newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
if use systemd; then if use systemd; then
systemd_dounit "${FILESDIR}"/anbox-{{container,session}-manager.service,bridge.net{dev,work}} systemd_dounit "${FILESDIR}"/anbox-{container-manager.service,bridge.net{dev,work}}
systemd_douserunit "${FILESDIR}"/anbox-session-manager.service
else else
exeinto /usr/share/anbox exeinto /usr/share/anbox
doexe "scripts/anbox-bridge.sh" doexe "scripts/anbox-bridge.sh"

5
app-emulation/anbox/anbox-9999.ebuild
View File

@ -60,7 +60,7 @@ CONFIG_CHECK="
~TMPFS_XATTR ~TMPFS_XATTR
" "
PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" ) PATCHES=( ""${FILESDIR}"/no_bundled_sdbus-r1.patch" ""${FILESDIR}"/lxc.patch" )
pkg_pretend() { pkg_pretend() {
if use !systemd; then if use !systemd; then
@ -97,7 +97,8 @@ src_install() {
cmake_src_install cmake_src_install
newbin "${FILESDIR}"/anbox-launch.sh anbox-launch newbin "${FILESDIR}"/anbox-launch.sh anbox-launch
if use systemd; then if use systemd; then
systemd_dounit "${FILESDIR}"/anbox-{{container,session}-manager.service,bridge.net{dev,work}} systemd_dounit "${FILESDIR}"/anbox-{container-manager.service,bridge.net{dev,work}}
systemd_douserunit "${FILESDIR}"/anbox-session-manager.service
else else
exeinto /usr/share/anbox exeinto /usr/share/anbox
doexe "scripts/anbox-bridge.sh" doexe "scripts/anbox-bridge.sh"

16
app-emulation/anbox/files/lxc.patch Normal file
View File

@ -0,0 +1,16 @@
https://github.com/anbox/anbox/pull/1827
--- a/src/anbox/container/lxc_container.cpp
+++ b/src/anbox/container/lxc_container.cpp
@@ -343,8 +343,10 @@ void LxcContainer::start(const Configuration &configuration) {
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, "");