Merge remote-tracking branch 'upstream/master'

2021-01-01 17:04:50 +01:00 · 2021-01-01 17:04:50 +01:00 · 58dea29d24
commit 58dea29d24
parent 8f38cccc67 9807ed7238
3 changed files with 9 additions and 2 deletions
--- a/app-emulation/anbox/anbox-0_pre20201129.ebuild
+++ b/app-emulation/anbox/anbox-0_pre20201129.ebuild
@ -40,6 +40,7 @@ DEPEND="
 	media-libs/mesa[egl,gles2]
 	media-libs/sdl2-image
 	sys-apps/dbus
+	sys-fs/fuse:3
 	sys-libs/libcap
 	|| ( sys-apps/systemd sys-auth/elogind )
 "
@ -51,7 +52,7 @@ CONFIG_CHECK="
 	~ANDROID_BINDER_IPC
 	~ASHMEM
 	~BLK_DEV_LOOP
-	~FUSE
+	~FUSE_FS
 	~SQUASHFS
 	~SQUASHFS_XZ
 	~SQUASHFS_XATTR
--- a/app-emulation/anbox/anbox-9999.ebuild
+++ b/app-emulation/anbox/anbox-9999.ebuild
@ -40,6 +40,7 @@ DEPEND="
 	media-libs/mesa[egl,gles2]
 	media-libs/sdl2-image
 	sys-apps/dbus
+	sys-fs/fuse:3
 	sys-libs/libcap
 	|| ( sys-apps/systemd sys-auth/elogind )
 "
@ -51,7 +52,7 @@ CONFIG_CHECK="
 	~ANDROID_BINDER_IPC
 	~ASHMEM
 	~BLK_DEV_LOOP
-	~FUSE
+	~FUSE_FS
 	~SQUASHFS
 	~SQUASHFS_XZ
 	~SQUASHFS_XATTR
--- a/app-emulation/anbox/files/anbox-container-manager.initd
+++ b/app-emulation/anbox/files/anbox-container-manager.initd
@ -20,6 +20,11 @@ start_pre() {
 	modprobe loop
 	modprobe tun

+	if ! [[ -d /dev/binderfs ]]; then
+		mkdir /dev/binderfs
+		mount -t binder binder /dev/binderfs
+	fi
+
 	if ip link show anbox0 >/dev/null 2>&1; then
 		ewarn "anbox0 network interface already exists"
 	else