From a1f1e60b68f9b269db5e9cbdc800618d6bb4208d Mon Sep 17 00:00:00 2001 From: Jami Kettunen Date: Mon, 5 Dec 2022 15:53:23 +0200 Subject: [PATCH] waydroid: update to 1.3.4. "Waydroid waiting for initialization..." could show up on tty1 interrupting agetty login flow for example, so add vlogger. Also clarify README.voidlinux now that Android 11 system images are the default, mention GRUB wiki example for changing cmdline on a typical x86 setup. --- srcpkgs/waydroid/files/README.voidlinux | 9 ++++++--- srcpkgs/waydroid/files/waydroid-container/log/run | 1 + srcpkgs/waydroid/template | 6 +++--- 3 files changed, 10 insertions(+), 6 deletions(-) create mode 120000 srcpkgs/waydroid/files/waydroid-container/log/run diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux index f185f4f454d8..b8dd76821536 100644 --- a/srcpkgs/waydroid/files/README.voidlinux +++ b/srcpkgs/waydroid/files/README.voidlinux @@ -1,10 +1,13 @@ To finish Waydroid installation run: - # waydroid init # ln -s /etc/sv/waydroid-container /var/service + # waydroid init -Additionally for Android 11+ system images ensure 'psi=1' is present on your -/proc/cmdline (unless the kernel is configured with CONFIG_PSI_DEFAULT_DISABLED=n). +Additionally ensure 'psi=1' is present on your /proc/cmdline (unless the kernel +is configured with CONFIG_PSI_DEFAULT_DISABLED=n); without this /system/bin/lmkd +will keep crashing and the LXC container won't finish booting. +For more details on kernel command line arguments and their configuration see +https://docs.voidlinux.org/config/kernel.html#cmdline Currently for audio support you need a PulseAudio server running (pipewire-pulse also works). diff --git a/srcpkgs/waydroid/files/waydroid-container/log/run b/srcpkgs/waydroid/files/waydroid-container/log/run new file mode 120000 index 000000000000..3a5b4a586051 --- /dev/null +++ b/srcpkgs/waydroid/files/waydroid-container/log/run @@ -0,0 +1 @@ +/usr/bin/vlogger \ No newline at end of file diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template index f24a4a3d00cb..cbc1d8587efe 100644 --- a/srcpkgs/waydroid/template +++ b/srcpkgs/waydroid/template @@ -1,7 +1,7 @@ # Template file for 'waydroid' pkgname=waydroid -version=1.3.3 -revision=2 +version=1.3.4 +revision=1 # https://developer.android.com/ndk/guides/abis#sa archs="aarch64* armv7* i686* x86_64*" build_style=gnu-makefile @@ -13,7 +13,7 @@ license="GPL-3.0-or-later" homepage="https://waydro.id" changelog="https://raw.githubusercontent.com/waydroid/waydroid/main/debian/changelog" distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz" -checksum=63d174dabff4af2ad862f129bba8eb60aa96c8cd31ee4896df18dd407d661859 +checksum=32e30e6c7384a514649daeac68b1326e2781362692ae143927628ff2f1387c4e python_version=3 pycompile_dirs="usr/lib/waydroid"