Changes - SailfishOS Open Build Service

Changes of Revision 4

[-] [+]	Changed	_service:tar_git:waydroid.spec
@@ -1,21 +1,19 @@ Name: waydroid -Version: 1.2.0+treltexx.20220224144101.45e10e3 -Release: 1 +Version: 1.2.0+main.20220722113242.41a82e6 +Release: 4 Summary: Waydroid uses a container-based approach to boot a full Android system on a regular GNU/Linux system like Ubuntu. License: GPLv3 URL: https://github.com/waydroid -BuildArch: noarch Source0: %{name}-%{version}.tar.gz -Source1: anbox.conf -Source2: waydroid-container.service -Source3: waydroid.conf +Patch0: 0001-disable-user-manager.patch BuildRequires: systemd -BuildRequires: desktop-file-utils Requires: lxc Requires: dnsmasq -Requires: python-gbinder-python +Requires: python3-gbinder-python Requires: python3-gobject +Requires: waydroid-sensors +Requires: waydroid-gbinder-config %description Waydroid uses Linux namespaces (user, pid, uts, net, mount, ipc) to run a full Android system in a container and provide Android applications on any GNU/Linux-based platform. @@ -24,6 +22,31 @@ The Android runtime environment ships with a minimal customized Android system image based on LineageOS. The image is currently based on Android 10. +%package settings +Summary: System Settings module for Waydroid +Requires: %{name} = %{version} + +%description settings +Support for enabling Waydroid session as a systemd service and use of Waydroid through direct rendering on Sailfish composer. + +%package gbinder-config-hybris +Summary: gbinder config for hybris ports +Requires: %{name} = %{version} +Provides: waydroid-gbinder-config +Conflicts: waydroid-gbinder-config-mainline + +%description gbinder-config-hybris +Provides the gbinder config required for waydroid based on typical hybris based ports + +%package gbinder-config-mainline +Summary: gbinder config for mainline ports +Requires: %{name} = %{version} +Provides: waydroid-gbinder-config +Conflicts: waydroid-gbinder-config-hybirs + +%description gbinder-config-mainline +Provides the gbinder config required for waydroid based on mainline (native) kernel + %prep %setup %patch0 -p1 @@ -37,9 +60,15 @@ mkdir -p %{buildroot}/usr/bin ln -sf /opt/waydroid/waydroid.py %{buildroot}/usr/bin/waydroid -install -D -m644 %{SOURCE1} %{buildroot}/etc/gbinder.d/anbox.conf -install -D -m644 %{SOURCE2} %{buildroot}/%{_unitdir}/waydroid-container.service -install -D -m644 %{SOURCE3} %{buildroot}/etc/modules-load.d/waydroid.conf +install -D -m644 config/anbox-hybris.conf %{buildroot}/etc/gbinder.d/anbox-hybris.conf +install -D -m644 config/anbox-mainline.conf %{buildroot}/etc/gbinder.d/anbox-mainline.conf +install -D -m644 config/waydroid-container.service %{buildroot}/usr/lib/systemd/system/waydroid-container.service +install -D -m644 config/waydroid-session.service %{buildroot}/usr/lib/systemd/user/waydroid-session.service +install -D -m644 config/waydroid.conf %{buildroot}/etc/modules-load.d/waydroid.conf + +# Settings files +install -D -m644 settings/waydroid.json %{buildroot}/usr/share/jolla-settings/entries/waydroid.json +install -D -m644 settings/Waydroid.qml %{buildroot}/usr/share/waydroid/settings/Waydroid.qml %clean rm -rf $RPM_BUILD_ROOT @@ -48,13 +77,28 @@ systemctl daemon-reload systemctl-user daemon-reload systemctl enable waydroid-container +chmod 777 /home/waydroid %files %defattr(-,root,root,-) /opt/waydroid %attr(-, defaultuser, users)/home/waydroid %{_sharedstatedir}/waydroid -%{_sysconfdir}/gbinder.d/anbox.conf %{_sysconfdir}/modules-load.d/waydroid.conf %{_bindir}/waydroid %{_unitdir}/waydroid-container.service + +%files settings +%defattr(-,root,root,-) +%{_userunitdir}/waydroid-session.service +%{_datadir}/jolla-settings/entries/waydroid.json +%{_datadir}/waydroid/settings/Waydroid.qml +#%{_datadir}/applications/waydroid.desktop + +%files gbinder-config-hybris +%defattr(-,root,root,-) +%{_sysconfdir}/gbinder.d/anbox-hybris.conf + +%files gbinder-config-mainline +%defattr(-,root,root,-) +%{_sysconfdir}/gbinder.d/anbox-mainline.conf
[-] [+]	Added	_service:tar_git:0001-disable-user-manager.patch ^
@@ -0,0 +1,13 @@ +diff --git a/upstream/tools/services/user_manager.py b/upstream/tools/services/user_manager.py +index 137c5de..f4eb7f0 100644 +--- a/upstream/tools/services/user_manager.py ++++ b/upstream/tools/services/user_manager.py +@@ -92,7 +92,7 @@ def start(args, unlocked_cb=None): + IUserMonitor.add_service(args, userUnlocked, packageStateChanged) + + args.user_manager = threading.Thread(target=service_thread) +- args.user_manager.start() ++ #args.user_manager.start() + + def stop(args): + try:
[-] [+]	Changed	_service ^
@@ -1,7 +1,7 @@ <services> <service name="tar_git"> <param name="url">https://github.com/edp17/waydroid.git</param> - <param name="branch">treltexx</param> + <param name="branch">main</param> <param name="revision"/> <param name="token"/> <param name="debian">N</param>
[-] [+]	Deleted	_service:tar_git:anbox.conf ^
@@ -1,10 +0,0 @@ -[Protocol] -/dev/puddlejumper = aidl2 -/dev/vndpuddlejumper = aidl2 -/dev/hwpuddlejumper = hidl - -[ServiceManager] -/dev/puddlejumper = aidl2 -/dev/vndpuddlejumper = aidl2 -/dev/hwpuddlejumper = hidl -
	Added	_service:tar_git:waydroid-1.2.0+main.20220722113242.41a82e6.tar.gz ^
	Deleted	_service:tar_git:waydroid-1.2.0+treltexx.20220224144101.45e10e3.tar.gz ^
[-] [+]	Deleted	_service:tar_git:waydroid-container.service ^
@@ -1,10 +0,0 @@ -[Unit] -Description=Waydroid container - -[Service] -ExecStart=/usr/bin/waydroid container start -ExecStop=/usr/bin/waydroid container stop -ExecStopPost=/usr/bin/waydroid session stop - -[Install] -WantedBy=multi-user.target
	Deleted	_service:tar_git:waydroid-sensord ^
[-] [+]	Deleted	_service:tar_git:waydroid-sensors.service ^
@@ -1,10 +0,0 @@ -[Unit] -Description=Waydroid sensors -Requires=lipstick.service -After=lipstick.service - -[Service] -ExecStart=/usr/local/bin/waydroid-sensord - -[Install] -WantedBy=post-user-session.target
[-] [+]	Deleted	_service:tar_git:waydroid.conf ^
@@ -1,3 +0,0 @@ -veth -xt_CHECKSUM -