* [PR PATCH] waydroid: update to 1.4.0
@ 2023-02-08 20:45 JamiKettunen
2023-02-10 10:50 ` [PR PATCH] [Updated] " JamiKettunen
` (26 more replies)
0 siblings, 27 replies; 28+ messages in thread
From: JamiKettunen @ 2023-02-08 20:45 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1248 bytes --]
There is a new 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.0
<!-- 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: 5532 bytes --]
From cb608adece1bf430f8c2d396bbcb3c2c0f5cfe17 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 1/3] libglibutil: update to 1.0.68.
---
srcpkgs/libglibutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..298699ae0ab4 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
# Template file for 'libglibutil'
pkgname=libglibutil
-version=1.0.67
+version=1.0.68
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -15,7 +15,7 @@ maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/sailfishos/libglibutil"
distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=f21df6fe6571f9e79ea2dd0d66c80016f400edd42a68dd7f61e381d103420099
post_install() {
vlicense LICENSE
From 4f991a467c3078cb083ff4f94d9585cc7b433c24 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 2/3] libgbinder: update to 1.1.32.
---
srcpkgs/libgbinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..c27d0de04e5d 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
# Template file for 'libgbinder'
pkgname=libgbinder
-version=1.1.31
+version=1.1.32
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mer-hybris/libgbinder"
changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=622cf0b49f57f8216e554850491e0b95a10800e01d0da3cbc1b36d956206bf9c
post_install() {
vlicense LICENSE
From fb6a54aac248de722c248015a30ab58656cf3407 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 3/3] waydroid: update to 1.4.0.
Also drop psi=1 tip as it appears pressure stall information isn't
needed anymore to use Waydroid.
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 Void Linux (runit).
---
srcpkgs/waydroid/files/README.voidlinux | 8 +-------
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..0d6a1085ede4 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -3,19 +3,13 @@ To finish Waydroid installation run:
# ln -s /etc/sv/waydroid-container /var/service
# 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.
-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).
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 b926f6c70305..e39a4950a986 100644
--- a/srcpkgs/waydroid/files/waydroid-container/run
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -1,2 +1,3 @@
#!/bin/sh
+sv check dbus >/dev/null || exit 1
exec waydroid -w container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index af8f78ff64c8..5f2c0e5235a9 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.0
+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=0b926e795eb68c58985f7e762737d3e8ea078ebc59c20d59febd3a90adf0a2b2
python_version=3
pycompile_dirs="usr/lib/waydroid"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
@ 2023-02-10 10:50 ` JamiKettunen
2023-02-10 12:34 ` JamiKettunen
` (25 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-02-10 10:50 UTC (permalink / raw)
To: ml
[-- 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.0
<!-- 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: 5543 bytes --]
From 8c4a27e47073300f145fb48bd3853d78e31c6090 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 1/3] libglibutil: update to 1.0.68.
---
srcpkgs/libglibutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..298699ae0ab4 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
# Template file for 'libglibutil'
pkgname=libglibutil
-version=1.0.67
+version=1.0.68
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -15,7 +15,7 @@ maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/sailfishos/libglibutil"
distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=f21df6fe6571f9e79ea2dd0d66c80016f400edd42a68dd7f61e381d103420099
post_install() {
vlicense LICENSE
From 5419d457b58aff72836b1b8bdaa2c5fbe3721c17 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 2/3] libgbinder: update to 1.1.32.
---
srcpkgs/libgbinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..c27d0de04e5d 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
# Template file for 'libgbinder'
pkgname=libgbinder
-version=1.1.31
+version=1.1.32
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mer-hybris/libgbinder"
changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=622cf0b49f57f8216e554850491e0b95a10800e01d0da3cbc1b36d956206bf9c
post_install() {
vlicense LICENSE
From 8c79caff9b95ded538a53747e1a111e02f437350 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 3/3] waydroid: update to 1.4.0.
Also drop psi=1 tip as it appears pressure stall information isn't
needed anymore to use Waydroid.
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 Void Linux (runit).
---
srcpkgs/waydroid/files/README.voidlinux | 8 +-------
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..0d6a1085ede4 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -3,19 +3,13 @@ To finish Waydroid installation run:
# ln -s /etc/sv/waydroid-container /var/service
# 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.
-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).
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..5f2c0e5235a9 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.0
+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=0b926e795eb68c58985f7e762737d3e8ea078ebc59c20d59febd3a90adf0a2b2
python_version=3
pycompile_dirs="usr/lib/waydroid"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
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
` (24 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-02-10 12:34 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1042 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1425751334
Comment:
Hm it seems right after update it's not possible to stop an already running `waydroid-container` service, rebooting fixes it... Checking running processes:
```
$ ps aux | grep waydroid
root 1015 0.0 0.0 2528 1228 ? Ss 12:08 0:00 runsvdir -P /run/runit/runsvdir/current log: : fatal: unable to start ./run: file does not exist runsv waydroid-container: warning: unable to open supervise/pid.new: file does not exist runsv waydroid-container: warning: unable to open supervise/pid.new: file does not exist runsv waydroid-container: fatal: unable to start ./run: file does not exist runsv waydroid-container: warning: unable to open supervise/pid.new: file does not exist
root 18254 0.0 0.0 2376 1024 ? Ss 12:57 0:00 runsv waydroid-container
root 18258 0.0 0.0 2496 924 ? S 12:57 0:00 vlogger -t waydroid-container -p daemon
```
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
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 ` JamiKettunen
2023-03-18 19:47 ` JamiKettunen
` (23 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-02-26 18:29 UTC (permalink / raw)
To: ml
[-- 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.0
<!-- 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: 5543 bytes --]
From eed3a5fb93843a445d971e6ea5ec5ac97ba2fadf Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 1/3] libglibutil: update to 1.0.68.
---
srcpkgs/libglibutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..298699ae0ab4 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
# Template file for 'libglibutil'
pkgname=libglibutil
-version=1.0.67
+version=1.0.68
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -15,7 +15,7 @@ maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/sailfishos/libglibutil"
distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=f21df6fe6571f9e79ea2dd0d66c80016f400edd42a68dd7f61e381d103420099
post_install() {
vlicense LICENSE
From d6286cd6804253e49291bf7209f8b156f203aabc Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 2/3] libgbinder: update to 1.1.33.
---
srcpkgs/libgbinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..72f6fab08306 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
# Template file for 'libgbinder'
pkgname=libgbinder
-version=1.1.31
+version=1.1.33
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mer-hybris/libgbinder"
changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=04f058a206a352fef743917c531a38fb751efdbea654bb03e5288fe16a100e29
post_install() {
vlicense LICENSE
From 9df3f9409d606b191e0c5c0b842da96a53b7a662 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 3/3] waydroid: update to 1.4.0.
Also drop psi=1 tip as it appears pressure stall information isn't
needed anymore to use Waydroid.
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 Void Linux (runit).
---
srcpkgs/waydroid/files/README.voidlinux | 8 +-------
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..0d6a1085ede4 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -3,19 +3,13 @@ To finish Waydroid installation run:
# ln -s /etc/sv/waydroid-container /var/service
# 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.
-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).
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..5f2c0e5235a9 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.0
+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=0b926e795eb68c58985f7e762737d3e8ea078ebc59c20d59febd3a90adf0a2b2
python_version=3
pycompile_dirs="usr/lib/waydroid"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (2 preceding siblings ...)
2023-02-26 18:29 ` [PR PATCH] [Updated] " JamiKettunen
@ 2023-03-18 19:47 ` JamiKettunen
2023-03-18 23:14 ` JamiKettunen
` (22 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-03-18 19:47 UTC (permalink / raw)
To: ml
[-- 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.0
<!-- 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: 5543 bytes --]
From 19239aec50e5105425cedc6ebba13f984deec275 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 1/3] libglibutil: update to 1.0.68.
---
srcpkgs/libglibutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..298699ae0ab4 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
# Template file for 'libglibutil'
pkgname=libglibutil
-version=1.0.67
+version=1.0.68
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -15,7 +15,7 @@ maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/sailfishos/libglibutil"
distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=f21df6fe6571f9e79ea2dd0d66c80016f400edd42a68dd7f61e381d103420099
post_install() {
vlicense LICENSE
From 65fae31d1191ffdfa523518b631b41f3f7e31fef Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 2/3] libgbinder: update to 1.1.33.
---
srcpkgs/libgbinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..72f6fab08306 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
# Template file for 'libgbinder'
pkgname=libgbinder
-version=1.1.31
+version=1.1.33
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mer-hybris/libgbinder"
changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=04f058a206a352fef743917c531a38fb751efdbea654bb03e5288fe16a100e29
post_install() {
vlicense LICENSE
From 42bd2ed5684bb066245dccee91deefde7c148d2d 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 3/3] waydroid: update to 1.4.0.
Also drop psi=1 tip as it appears pressure stall information isn't
needed anymore to use Waydroid.
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 Void Linux (runit).
---
srcpkgs/waydroid/files/README.voidlinux | 8 +-------
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
3 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
index 5efed75858fe..0d6a1085ede4 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -3,19 +3,13 @@ To finish Waydroid installation run:
# ln -s /etc/sv/waydroid-container /var/service
# 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.
-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).
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..5f2c0e5235a9 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.0
+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=0b926e795eb68c58985f7e762737d3e8ea078ebc59c20d59febd3a90adf0a2b2
python_version=3
pycompile_dirs="usr/lib/waydroid"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (3 preceding siblings ...)
2023-03-18 19:47 ` JamiKettunen
@ 2023-03-18 23:14 ` JamiKettunen
2023-03-22 13:35 ` JamiKettunen
` (21 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-03-18 23:14 UTC (permalink / raw)
To: ml
[-- 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.0
<!-- 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: 6334 bytes --]
From 6af54409559e1a491ab34b1c27b2e0961367cb1a Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 1/3] libglibutil: update to 1.0.68.
---
srcpkgs/libglibutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..298699ae0ab4 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
# Template file for 'libglibutil'
pkgname=libglibutil
-version=1.0.67
+version=1.0.68
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -15,7 +15,7 @@ maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/sailfishos/libglibutil"
distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=f21df6fe6571f9e79ea2dd0d66c80016f400edd42a68dd7f61e381d103420099
post_install() {
vlicense LICENSE
From 494c7b31f16a86d18cbdbd846917bd4c0b77cd91 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 2/3] libgbinder: update to 1.1.33.
---
srcpkgs/libgbinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..72f6fab08306 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
# Template file for 'libgbinder'
pkgname=libgbinder
-version=1.1.31
+version=1.1.33
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mer-hybris/libgbinder"
changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=04f058a206a352fef743917c531a38fb751efdbea654bb03e5288fe16a100e29
post_install() {
vlicense LICENSE
From 1ed22124bbae0aa2cee32d2d28c79d729a7cc9b8 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 3/3] waydroid: update to 1.4.0.
Also drop psi=1 tip as it appears pressure stall information isn't
needed anymore to use Waydroid.
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 Void Linux (runit).
---
srcpkgs/waydroid/INSTALL | 12 ++++++++----
srcpkgs/waydroid/files/README.voidlinux | 8 +-------
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/waydroid/INSTALL b/srcpkgs/waydroid/INSTALL
index b6ca3e4ef5ab..db1b1b9a6e10 100644
--- a/srcpkgs/waydroid/INSTALL
+++ b/srcpkgs/waydroid/INSTALL
@@ -1,8 +1,12 @@
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 sv check waydroid-container >/dev/null; then
+ echo "Restarting waydroid-container runit service..."
+ sv restart waydroid-container || :
+ fi
+ 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..0d6a1085ede4 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -3,19 +3,13 @@ To finish Waydroid installation run:
# ln -s /etc/sv/waydroid-container /var/service
# 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.
-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).
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..5f2c0e5235a9 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.0
+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=0b926e795eb68c58985f7e762737d3e8ea078ebc59c20d59febd3a90adf0a2b2
python_version=3
pycompile_dirs="usr/lib/waydroid"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (4 preceding siblings ...)
2023-03-18 23:14 ` JamiKettunen
@ 2023-03-22 13:35 ` JamiKettunen
2023-03-22 13:35 ` JamiKettunen
` (20 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-03-22 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 264 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1479578611
Comment:
`\\` on `#xbps` mentioned:
> I'm guessing that the supervised process actually terminated but the log process didn't
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (5 preceding siblings ...)
2023-03-22 13:35 ` JamiKettunen
@ 2023-03-22 13:35 ` JamiKettunen
2023-04-13 10:23 ` JamiKettunen
` (19 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-03-22 13:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 324 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1479578611
Comment:
`\\` on `#xbps` mentioned:
> I'm guessing that the supervised process actually terminated but the log process didn't. got that effect with tailscaled once, same force-reinstall
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (6 preceding siblings ...)
2023-03-22 13:35 ` JamiKettunen
@ 2023-04-13 10:23 ` JamiKettunen
2023-04-19 0:25 ` [PR PATCH] [Updated] " JamiKettunen
` (18 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-04-13 10:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 259 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1506721723
Comment:
The bug experienced here now appears to have a proper bug report @ https://github.com/void-linux/runit/issues/25
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (7 preceding siblings ...)
2023-04-13 10:23 ` JamiKettunen
@ 2023-04-19 0:25 ` JamiKettunen
2023-04-22 12:31 ` IceAsteroid
` (17 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-04-19 0:25 UTC (permalink / raw)
To: ml
[-- 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.0
<!-- 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: 6334 bytes --]
From 06011e0b9f212f93f229fee519a62051e81e5c1d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:07 +0200
Subject: [PATCH 1/3] libglibutil: update to 1.0.69.
---
srcpkgs/libglibutil/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
index 61a8191e84a8..bd1aff647373 100644
--- a/srcpkgs/libglibutil/template
+++ b/srcpkgs/libglibutil/template
@@ -1,6 +1,6 @@
# Template file for 'libglibutil'
pkgname=libglibutil
-version=1.0.67
+version=1.0.69
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -15,7 +15,7 @@ maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
license="BSD-3-Clause"
homepage="https://github.com/sailfishos/libglibutil"
distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
-checksum=622f7d420e3f95ee7237b65c17495fe8d4cda1ed0cb68e0794f63c57034e1401
+checksum=2aad04dedf77261e30029f9aeed43c877deed84451de83e9594f900c97bfa274
post_install() {
vlicense LICENSE
From 9dc134170ade646aaf93fc6d3204c6915ae2aac8 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 8 Feb 2023 22:26:10 +0200
Subject: [PATCH 2/3] libgbinder: update to 1.1.33.
---
srcpkgs/libgbinder/template | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
index 266533ff5415..72f6fab08306 100644
--- a/srcpkgs/libgbinder/template
+++ b/srcpkgs/libgbinder/template
@@ -1,6 +1,6 @@
# Template file for 'libgbinder'
pkgname=libgbinder
-version=1.1.31
+version=1.1.33
revision=1
build_style=gnu-makefile
make_use_env=1
@@ -16,7 +16,7 @@ license="BSD-3-Clause"
homepage="https://github.com/mer-hybris/libgbinder"
changelog="https://raw.githubusercontent.com/mer-hybris/libgbinder/master/debian/changelog"
distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
-checksum=a5b3cd4ad46d430982c337d933e2c187284d56bb5296d368aadff74f9e986237
+checksum=04f058a206a352fef743917c531a38fb751efdbea654bb03e5288fe16a100e29
post_install() {
vlicense LICENSE
From 167dd4cbcc9587fe5eff5018372cbc7e7fbfad81 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 3/3] waydroid: update to 1.4.0.
Also drop psi=1 tip as it appears pressure stall information isn't
needed anymore to use Waydroid.
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 Void Linux (runit).
---
srcpkgs/waydroid/INSTALL | 12 ++++++++----
srcpkgs/waydroid/files/README.voidlinux | 8 +-------
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/srcpkgs/waydroid/INSTALL b/srcpkgs/waydroid/INSTALL
index b6ca3e4ef5ab..db1b1b9a6e10 100644
--- a/srcpkgs/waydroid/INSTALL
+++ b/srcpkgs/waydroid/INSTALL
@@ -1,8 +1,12 @@
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 sv check waydroid-container >/dev/null; then
+ echo "Restarting waydroid-container runit service..."
+ sv restart waydroid-container || :
+ fi
+ 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..0d6a1085ede4 100644
--- a/srcpkgs/waydroid/files/README.voidlinux
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -3,19 +3,13 @@ To finish Waydroid installation run:
# ln -s /etc/sv/waydroid-container /var/service
# 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.
-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).
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..5f2c0e5235a9 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.0
+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=0b926e795eb68c58985f7e762737d3e8ea078ebc59c20d59febd3a90adf0a2b2
python_version=3
pycompile_dirs="usr/lib/waydroid"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (8 preceding siblings ...)
2023-04-19 0:25 ` [PR PATCH] [Updated] " JamiKettunen
@ 2023-04-22 12:31 ` IceAsteroid
2023-04-22 12:32 ` IceAsteroid
` (16 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-22 12:31 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 495 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1518636632
Comment:
Looking forward to trying out this new version of waydroid, hope it'll fix the "ERROR: invalid literal for int() with base 10: '['" error when running "sudo proxychains4 waydroid init".
Or, probably, just because of the use of proxychains4. But this issue has also been posted on the waydroid repo, https://github.com/waydroid/waydroid/issues/176
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (9 preceding siblings ...)
2023-04-22 12:31 ` IceAsteroid
@ 2023-04-22 12:32 ` IceAsteroid
2023-04-22 12:33 ` IceAsteroid
` (15 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-22 12:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1518636632
Comment:
Looking forward to trying out this new version of waydroid, hope it'll fix the
`ERROR:` invalid literal for int() with base 10: '['`
error when running "sudo proxychains4 waydroid init".
Or, probably, just because of the use of proxychains4. But this issue has also been posted on the waydroid repo, https://github.com/waydroid/waydroid/issues/176
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (10 preceding siblings ...)
2023-04-22 12:32 ` IceAsteroid
@ 2023-04-22 12:33 ` IceAsteroid
2023-04-22 12:40 ` IceAsteroid
` (14 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-22 12:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 502 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1518636632
Comment:
Looking forward to trying out this new version of waydroid, hope it'll fix the
`ERROR: invalid literal for int() with base 10: '['`
error when running "sudo proxychains4 waydroid init".
Or, probably, just because of the use of proxychains4. But this issue has also been posted on the waydroid repo, https://github.com/waydroid/waydroid/issues/176
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (11 preceding siblings ...)
2023-04-22 12:33 ` IceAsteroid
@ 2023-04-22 12:40 ` IceAsteroid
2023-04-22 13:17 ` JamiKettunen
` (13 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-22 12:40 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1518636632
Comment:
Looking forward to trying out this new version of waydroid, hope it'll fix the
```
[00:00:00] Extracting to /var/lib/waydroid/images
[00:00:00] ERROR: invalid literal for int() with base 10: '['
[00:00:00] See also: <https://github.com/waydroid>
```
error when running "sudo proxychains4 waydroid init".
Or, probably, just because of the use of proxychains4. But this issue has also been posted on the waydroid repo, https://github.com/waydroid/waydroid/issues/176
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (12 preceding siblings ...)
2023-04-22 12:40 ` IceAsteroid
@ 2023-04-22 13:17 ` JamiKettunen
2023-04-25 9:49 ` IceAsteroid
` (12 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-04-22 13:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 691 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1518655543
Comment:
@IceAsteroid I've never seen that so I expect that to be an issue specific to using `proxychains4`. The linked issue doesn't seem related to yours either (it only contains a small part of your error message but otherwise is completely different).
You could build and install the new packages from my fork already (similar to https://github.com/void-linux/void-packages#quick-start) and see if that changes anything but I doubt it. Feel free to make a new issue upstream discussing this and if you can try to debug where it's failing yourself
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (13 preceding siblings ...)
2023-04-22 13:17 ` JamiKettunen
@ 2023-04-25 9:49 ` IceAsteroid
2023-04-25 9:50 ` IceAsteroid
` (11 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 655 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521500265
Comment:
@JamiKettunen Thank you for replying. After not using proxychains4, I managed to get it completing initialization by the "waydroid init" in a root shell.
However, a new issue kicked in as the GUI interface woundn't show up at all by "waydroid show-full-ui" in a user shell while "waydroid-container" is running at root. I posted an issue on the waydroid repo: https://github.com/waydroid/waydroid/issues/864
But, yeah, I'll try to figure out by using a custom package based on your fork. So much thank!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (14 preceding siblings ...)
2023-04-25 9:49 ` IceAsteroid
@ 2023-04-25 9:50 ` IceAsteroid
2023-04-25 9:50 ` IceAsteroid
` (10 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 663 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521500265
Comment:
@JamiKettunen Thank you for replying. After not using proxychains4, I managed to get it completing initialization by the "waydroid init" command in a root shell.
However, a new issue kicked in as the GUI interface woundn't show up at all by "waydroid show-full-ui" in a user shell while "waydroid-container" is running at root. I posted an issue on the waydroid repo: https://github.com/waydroid/waydroid/issues/864
But, yeah, I'll try to figure out by using a custom package based on your fork. So much thank!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (15 preceding siblings ...)
2023-04-25 9:50 ` IceAsteroid
@ 2023-04-25 9:50 ` IceAsteroid
2023-04-25 9:50 ` IceAsteroid
` (9 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521500265
Comment:
@JamiKettunen Thank you for replying. After not using proxychains4, I managed to get it completing initialization by the "waydroid init" command in a root shell.
However, a new issue kicked in as the GUI interface wouldn't show up at all by "waydroid show-full-ui" in a user shell while "waydroid-container" was running at root. I posted an issue on the waydroid repo: https://github.com/waydroid/waydroid/issues/864
But, yeah, I'll try to figure out by using a custom package based on your fork. So much thank!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (16 preceding siblings ...)
2023-04-25 9:50 ` IceAsteroid
@ 2023-04-25 9:50 ` IceAsteroid
2023-04-25 9:54 ` IceAsteroid
` (8 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:50 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 667 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521500265
Comment:
@JamiKettunen Thank you for replying.
After not using proxychains4, I managed to get it completing initialization by the "waydroid init" command in a root shell.
However, a new issue kicked in as the GUI interface wouldn't show up at all by "waydroid show-full-ui" in a user shell while "waydroid-container" was running at root. I posted an issue on the waydroid repo: https://github.com/waydroid/waydroid/issues/864
But, yeah, I'll try to figure out by using a custom package based on your fork. So much thank!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (17 preceding siblings ...)
2023-04-25 9:50 ` IceAsteroid
@ 2023-04-25 9:54 ` IceAsteroid
2023-04-25 9:56 ` IceAsteroid
` (7 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:54 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 815 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521500265
Comment:
@JamiKettunen Thank you for replying.
After not using proxychains4, I managed to get it completing initialization by the "waydroid init" command in a root shell.
However, a new issue kicked in as the GUI interface wouldn't show up at all by "waydroid show-full-ui" in a user shell while "waydroid-container" was running at root.
I also tried to uninstall waydroid and removed all of its leftovers as guided by the waydroid official documentaion, but no luck either.
So, I posted an issue on the waydroid repo: https://github.com/waydroid/waydroid/issues/864
But, yeah, I'll try to figure out by using a custom package based on your fork. So much thank!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (18 preceding siblings ...)
2023-04-25 9:54 ` IceAsteroid
@ 2023-04-25 9:56 ` IceAsteroid
2023-04-25 9:56 ` IceAsteroid
` (6 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521509252
Comment:
@JamiKettunen Also, is there anything more required to run waydroid on voidlinux besides the waydroid package and other packages required to have clipbaord support?
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (19 preceding siblings ...)
2023-04-25 9:56 ` IceAsteroid
@ 2023-04-25 9:56 ` IceAsteroid
2023-04-25 9:58 ` IceAsteroid
` (5 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:56 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 310 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521509252
Comment:
@JamiKettunen Also, is there anything more required to run waydroid on voidlinux besides the waydroid package and other packages required to have clipboard support?
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (20 preceding siblings ...)
2023-04-25 9:56 ` IceAsteroid
@ 2023-04-25 9:58 ` IceAsteroid
2023-05-12 20:44 ` illusioon
` (4 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: IceAsteroid @ 2023-04-25 9:58 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 818 bytes --]
New comment by IceAsteroid on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1521500265
Comment:
@JamiKettunen Thank you for replying! :)
After not using proxychains4, I managed to get it completing initialization by the "waydroid init" command in a root shell.
However, a new issue kicked in as the GUI interface wouldn't show up at all by "waydroid show-full-ui" in a user shell while "waydroid-container" was running at root.
I also tried to uninstall waydroid and removed all of its leftovers as guided by the waydroid official documentaion, but no luck either.
So, I posted an issue on the waydroid repo: https://github.com/waydroid/waydroid/issues/864
But, yeah, I'll try to figure out by using a custom package based on your fork. So much thank!
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (21 preceding siblings ...)
2023-04-25 9:58 ` IceAsteroid
@ 2023-05-12 20:44 ` illusioon
2023-05-13 0:15 ` JamiKettunen
` (3 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: illusioon @ 2023-05-12 20:44 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 184 bytes --]
New comment by illusioon on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1546274268
Comment:
With this new update waydroid now works.
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (22 preceding siblings ...)
2023-05-12 20:44 ` illusioon
@ 2023-05-13 0:15 ` JamiKettunen
2023-06-20 19:54 ` [PR PATCH] [Updated] " JamiKettunen
` (2 subsequent siblings)
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-05-13 0:15 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 434 bytes --]
New comment by JamiKettunen on void-packages repository
https://github.com/void-linux/void-packages/pull/42154#issuecomment-1546457929
Comment:
I'll update the packages tomorrow and hopefully get this ready for merge, can't do much about the runit bug anyway other than print workaround messages for post-upgrade as it would happen to anyone that hasn't updated `runit` even after it's already fixed in the future, just annoying...
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (23 preceding siblings ...)
2023-05-13 0:15 ` JamiKettunen
@ 2023-06-20 19:54 ` JamiKettunen
2023-06-23 13:33 ` [PR PATCH] [Updated] waydroid: update to 1.4.1 JamiKettunen
2023-06-23 13:49 ` [PR PATCH] [Merged]: " Duncaen
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-06-20 19:54 UTC (permalink / raw)
To: ml
[-- 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.0
<!-- 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: 4460 bytes --]
From 405cc598713c80740f4da3a11d606e59be45bfab 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/INSTALL.msg | 9 +++++++++
srcpkgs/waydroid/files/README.voidlinux | 7 ++++---
srcpkgs/waydroid/files/waydroid-container/run | 1 +
srcpkgs/waydroid/template | 11 ++++++-----
5 files changed, 24 insertions(+), 12 deletions(-)
create mode 100644 srcpkgs/waydroid/INSTALL.msg
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/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..2419f4538718
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,9 @@
+To finish upgrading Waydroid:
+
+ # sv restart waydroid-container
+
+In case the above times out, until https://github.com/void-linux/runit/issues/25
+is solved you need to:
+
+ # kill $(pgrep -fx 'runsv waydroid-container')
+
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"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Updated] waydroid: update to 1.4.1
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (24 preceding siblings ...)
2023-06-20 19:54 ` [PR PATCH] [Updated] " JamiKettunen
@ 2023-06-23 13:33 ` JamiKettunen
2023-06-23 13:49 ` [PR PATCH] [Merged]: " Duncaen
26 siblings, 0 replies; 28+ messages in thread
From: JamiKettunen @ 2023-06-23 13:33 UTC (permalink / raw)
To: ml
[-- 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"
^ permalink raw reply [flat|nested] 28+ messages in thread
* Re: [PR PATCH] [Merged]: waydroid: update to 1.4.1
2023-02-08 20:45 [PR PATCH] waydroid: update to 1.4.0 JamiKettunen
` (25 preceding siblings ...)
2023-06-23 13:33 ` [PR PATCH] [Updated] waydroid: update to 1.4.1 JamiKettunen
@ 2023-06-23 13:49 ` Duncaen
26 siblings, 0 replies; 28+ messages in thread
From: Duncaen @ 2023-06-23 13:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1086 bytes --]
There's a merged pull request on the void-packages repository
waydroid: update to 1.4.1
https://github.com/void-linux/void-packages/pull/42154
Description:
<!-- 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
-->
^ permalink raw reply [flat|nested] 28+ messages in thread
end of thread, other threads:[~2023-06-23 13:49 UTC | newest]
Thread overview: 28+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
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 ` [PR PATCH] [Updated] waydroid: update to 1.4.1 JamiKettunen
2023-06-23 13:49 ` [PR PATCH] [Merged]: " Duncaen
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).