|
[-]
[+]
|
Changed |
_service:tar_git:waydroid.spec
|
|
|
|
[-]
[+]
|
Changed |
_service
^
|
| @@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/sailfishos-open/waydroid.git</param>
<param name="branch">main</param>
- <param name="revision">1.2.0+git3</param>
+ <param name="revision">1.2.0+git4</param>
<param name="token"/>
<param name="debian">N</param>
<param name="dumb">N</param>
|
|
[-]
[+]
|
Changed |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/README.md
^
|
| @@ -18,8 +18,10 @@
In the case of the dedicated app, Waydroid session will be started
with start of the app and closed with the app. As a result, it is
-slower than using pre-started Waydroid session via systemd. The
-dedicated app can be installed via *waydroid-runner* package.
+slower to start than using pre-started Waydroid session via
+systemd. In addition, as it is using nested Wayland composer, it is
+expected to be slower than running directly on Lipstick. The dedicated
+app can be installed via *waydroid-runner* package.
* Install `waydroid-settings` or `waydroid-runner` package.
* As root (devel-su) run the command `waydroid init` which will download the required root filesystems. See `waydroid init -h` for the list of available images.
|
|
[-]
[+]
|
Changed |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/config/anbox-hybris.conf
^
|
| (renamed from config/anbox.conf)
|
|
[-]
[+]
|
Added |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/config/anbox-mainline.conf
^
|
| @@ -0,0 +1,10 @@
+[Protocol]
+/dev/binder = aidl2
+/dev/vndbinder = aidl2
+/dev/hwbinder = hidl
+
+[ServiceManager]
+/dev/binder = aidl2
+/dev/vndbinder = aidl2
+/dev/hwbinder = hidl
+
|
|
[-]
[+]
|
Changed |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/upstream/tools/actions/initializer.py
^
|
| @@ -81,7 +81,7 @@
tools.config.save(args, cfg)
def init(args):
- if not os.path.isfile(args.config) or args.force:
+ if not os.path.isfile(args.config) or not os.path.isdir(tools.config.defaults["rootfs"]) or args.force:
setup_config(args)
status = "STOPPED"
if os.path.exists(tools.config.defaults["lxc"] + "/waydroid"):
|
|
[-]
[+]
|
Changed |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/upstream/tools/helpers/images.py
^
|
| @@ -36,6 +36,10 @@
args, system_response['url'], system_response['filename'], cache=False)
logging.info("Validating system image")
if sha256sum(images_zip) != system_response['id']:
+ try:
+ os.remove(images_zip)
+ except:
+ pass
raise ValueError("Downloaded system image hash doesn't match, expected: {}".format(
system_response['id']))
logging.info("Extracting to " + args.images_path)
@@ -61,6 +65,10 @@
args, vendor_response['url'], vendor_response['filename'], cache=False)
logging.info("Validating vendor image")
if sha256sum(images_zip) != vendor_response['id']:
+ try:
+ os.remove(images_zip)
+ except:
+ pass
raise ValueError("Downloaded vendor image hash doesn't match, expected: {}".format(
vendor_response['id']))
logging.info("Extracting to " + args.images_path)
|
|
[-]
[+]
|
Changed |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/upstream/tools/helpers/lxc.py
^
|
| @@ -231,7 +231,7 @@
else:
if os.path.isfile("/proc/device-tree/" + product):
with open("/proc/device-tree/" + product) as f:
- f_value = f.read().strip()
+ f_value = f.read().strip().rstrip('\x00')
if f_value != "":
props.append("ro.product.waydroid." +
product + "=" + f_value)
|
|
[-]
[+]
|
Changed |
_service:tar_git:waydroid-1.2.0+git4.tar.gz/upstream/tools/helpers/props.py
^
|
| @@ -1,6 +1,7 @@
# Copyright 2021 Oliver Smith
# SPDX-License-Identifier: GPL-3.0-or-later
from shutil import which
+import subprocess
import logging
import os
import tools.helpers.run
@@ -10,7 +11,7 @@
def host_get(args, prop):
if which("getprop") is not None:
command = ["getprop", prop]
- return tools.helpers.run.user(args, command, output_return=True).strip()
+ return subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()
else:
return ""
|
