From: JamiKettunen <JamiKettunen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] waydroid: update to 1.4.1
Date: Fri, 23 Jun 2023 15:33:51 +0200 [thread overview]
Message-ID: <20230623133351.KfbSXKVbsE-RiaTv_WduFegOsD0CToknMVYqtIw5Mew@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-42154@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1253 bytes --]
There is an updated pull request by JamiKettunen against master on the void-packages repository
https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/42154
waydroid: update to 1.4.1
<!-- Uncomment relevant sections and delete options which are not applicable -->
#### Testing the changes
- I tested the changes in this PR: **YES**
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/42154.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-42154.patch --]
[-- Type: text/x-diff, Size: 3929 bytes --]
From b2eacb335164c613c959239873a24f978f52eafe Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Mon, 16 Jan 2023 02:01:43 +0200
Subject: [PATCH] waydroid: update to 1.4.1.
D-Bus is now used for IPC but disable D-Bus activation for Waydroid
container because there's no way to supervise (or stop) it properly
under runit.
---
srcpkgs/waydroid/INSTALL | 8 ++++----
srcpkgs/waydroid/files/README.voidlinux | 7 ++++---
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
4 files changed, 15 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/waydroid/INSTALL b/srcpkgs/waydroid/INSTALL
index b6ca3e4ef5ab..34fa67f8c09e 100644
--- a/srcpkgs/waydroid/INSTALL
+++ b/srcpkgs/waydroid/INSTALL
@@ -1,8 +1,8 @@
case "$ACTION" in
post)
- if [ ! -f ./var/lib/waydroid/waydroid.cfg ]; then return 0; fi
- if [ ! -f ./var/lib/waydroid/waydroid_base.prop ]; then return 0; fi
- echo "Regenerating Waydroid configs..."
- waydroid upgrade --offline || exit 0
+ if [ -f /var/lib/waydroid/waydroid_base.prop ]; then
+ echo "Regenerating Waydroid configs..."
+ waydroid upgrade --offline || :
+ fi
;;
esac
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..5653c569b66e 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -4,8 +4,9 @@ To finish Waydroid installation run:
# waydroid init
Additionally ensure /proc/pressure/cpu exists, otherwise add 'psi=1' to your
-kernel cmdline; without this /system/bin/lmkd will keep crashing and the LXC
-container won't finish booting.
+kernel cmdline; without this under memory pressure e.g. even the OS bootup or
+gaming *may* cause the /dev/binder session manager to die due to
+/system/bin/lmkd crashing.
For more details on kernel command line arguments and their configuration see
https://docs.voidlinux.org/config/kernel.html#cmdline
@@ -15,7 +16,7 @@ also works).
Optionally clipboard syncing between the container and host Wayland compositor
can be enabled with:
- # xbps-install python3-pyclip wl-clipboard
+ # xbps-install -S python3-pyclip wl-clipboard
When running under X11 in a nested Wayland compositor you'll also need xclip.
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
index 3e44af632958..8de4fd3df6d2 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,3 +1,4 @@
#!/bin/sh
exec 2>&1
+sv check dbus >/dev/null || exit 1
exec waydroid -w container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index af8f78ff64c8..70e07b3e5c9a 100644
--- a/srcpkgs/waydroid/template
+++ b/srcpkgs/waydroid/template
@@ -1,19 +1,20 @@
# Template file for 'waydroid'
pkgname=waydroid
-version=1.3.4
-revision=2
+version=1.4.1
+revision=1
# https://developer.android.com/ndk/guides/abis#sa
archs="aarch64* armv7* i686* x86_64*"
build_style=gnu-makefile
-make_install_args="USE_NFTABLES=1"
-depends="python3 gbinder-python python3-gobject gtk+3 lxc dnsmasq nftables"
+make_install_args="USE_NFTABLES=1 USE_DBUS_ACTIVATION=0"
+depends="gbinder-python python3-gobject python3-dbus gtk+3 polkit dnsmasq
+ nftables lxc"
short_desc="Container-based approach to boot a full Android system"
maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
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=32e30e6c7384a514649daeac68b1326e2781362692ae143927628ff2f1387c4e
+checksum=6c9a87bf61efb72c19d96f442b710bd8b4dd5b5be093e10e2d0b1d1782376207
python_version=3
pycompile_dirs="usr/lib/waydroid"
next prev parent reply other threads:[~2023-06-23 13:33 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
2023-02-10 10:50 ` [PR PATCH] [Updated] " JamiKettunen
2023-02-10 12:34 ` JamiKettunen
2023-02-26 18:29 ` [PR PATCH] [Updated] " JamiKettunen
2023-03-18 19:47 ` JamiKettunen
2023-03-18 23:14 ` JamiKettunen
2023-03-22 13:35 ` JamiKettunen
2023-03-22 13:35 ` JamiKettunen
2023-04-13 10:23 ` JamiKettunen
2023-04-19 0:25 ` [PR PATCH] [Updated] " JamiKettunen
2023-04-22 12:31 ` IceAsteroid
2023-04-22 12:32 ` IceAsteroid
2023-04-22 12:33 ` IceAsteroid
2023-04-22 12:40 ` IceAsteroid
2023-04-22 13:17 ` JamiKettunen
2023-04-25 9:49 ` IceAsteroid
2023-04-25 9:50 ` IceAsteroid
2023-04-25 9:50 ` IceAsteroid
2023-04-25 9:50 ` IceAsteroid
2023-04-25 9:54 ` IceAsteroid
2023-04-25 9:56 ` IceAsteroid
2023-04-25 9:56 ` IceAsteroid
2023-04-25 9:58 ` IceAsteroid
2023-05-12 20:44 ` illusioon
2023-05-13 0:15 ` JamiKettunen
2023-06-20 19:54 ` [PR PATCH] [Updated] " JamiKettunen
2023-06-23 13:33 ` JamiKettunen [this message]
2023-06-23 13:49 ` [PR PATCH] [Merged]: waydroid: update to 1.4.1 Duncaen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230623133351.KfbSXKVbsE-RiaTv_WduFegOsD0CToknMVYqtIw5Mew@z \
--to=jamikettunen@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).