From: JamiKettunen <JamiKettunen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] waydroid: update to 1.4.0
Date: Sun, 19 Mar 2023 00:14:35 +0100 [thread overview]
Message-ID: <20230318231435.inDnhmyd-MIK1w8xhoq-O6tt9pUYh9c77yxezwVpET0@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.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"
next prev parent reply other threads:[~2023-03-18 23:14 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-08 20:45 [PR PATCH] " 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 [this message]
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
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=20230318231435.inDnhmyd-MIK1w8xhoq-O6tt9pUYh9c77yxezwVpET0@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).