Attachment 14134 Details for Bug 32496 – Update dkms-anbox to new commit

[patch] Update dkms-anbox to new commit

dkm-anbox-newversion.diff (text/plain), 2.62 KB, created by katnatek on 2023-11-05 21:27:59 CET

(hide)

Description:

Filename:

MIME Type:

Creator: katnatek

Created: 2023-11-05 21:27:59 CET

Size: 2.62 KB

patch

obsolete

>Index: SPECS/dkms-anbox.spec
>===================================================================
>--- SPECS/dkms-anbox.spec	(revisiÃ³n: 2004230)
>+++ SPECS/dkms-anbox.spec	(copia de trabajo)
>@@ -1,13 +1,12 @@
>-%global gitcommit abead1debfae56e8d0307c642865ec23aaa854d3
>+%global gitcommit 205c8037e61d4546d8c86c1f789cfaf18fa9bc24
> %global gitcommitshort %(gitcommit=%{gitcommit};echo ${gitcommit:0:8})
> 
>-%define         subrel 1
>-
> #broken on 6.3. kernels and not needed anymore
> %bcond_with 	ashmem
> 
> Name:           dkms-anbox
>-Version:        0.0.3
>+#Use date of commit as version
>+Version:        2023.11.01
> Release:        %mkrel 1
> Summary:        Anbox kernel modules for running an Android runtime such as Waydroid
> License:        GPLv3
>@@ -14,6 +13,8 @@
> Group:          System/Kernel and hardware
> URL:            https://github.com/choff/anbox-modules
> Source:         https://github.com/choff/anbox-modules/archive/%{gitcommit}/anbox-modules-%{gitcommitshort}.tar.gz
>+Patch0:			dkms-anbox-fixrule.patch
>+Patch1:			dkms-anbox-disableashmem.patch
> BuildArch:      noarch
> Requires:       dkms
> Provides:       anbox-kmp = %{version}
>@@ -29,6 +30,10 @@
> 
> %prep
> %setup -q -n anbox-modules-%{gitcommit}
>+%patch0 -p1
>+%if %{without ashmem}
>+%patch1 -p1
>+%endif
> 
> %build
> # nothing to build
>@@ -40,8 +45,11 @@
> cp -r ashmem %{buildroot}/%{_prefix}/src/anbox-ashmem-%{version}-%{release}
> %endif
> cp -r binder %{buildroot}/%{_prefix}/src/anbox-binder-%{version}-%{release}
>+install -Dp -m0644 99-anbox.rules %{buildroot}%{_udevrulesdir}/99-anbox.rules
>+install -D -m0644 anbox.conf %{buildroot}/etc/modules-load.d/anbox.conf
>+echo "options binder_linux devices=binder,hwbinder,vndbinder,anbox-binder,anbox-hwbinder,anbox-vndbinder" > anbox-options.conf
>+install -D -m0644 anbox-options.conf %{buildroot}/etc/modprobe.d/anbox-options.conf
> 
>-
> %post
> %if %{with ashmem}
> if [ -z "$(dkms status -m anbox-ashmem -v %{version}-%{release})" ]; then
>@@ -50,12 +58,14 @@
> dkms build -m anbox-ashmem -v %{version}-%{release}
> dkms install -m anbox-ashmem -v %{version}-%{release}
> %endif
>-
> if [ -z "$(dkms status -m anbox-binder -v %{version}-%{release})" ]; then
>     dkms add -m anbox-binder -v %{version}-%{release} --rpm_safe_upgrade
> fi
> dkms build -m anbox-binder -v %{version}-%{release}
> dkms install -m anbox-binder -v %{version}-%{release}
>+if ! lsmod|grep binder ; then
>+	/sbin/modprobe binder_linux -v
>+fi
> 
> %preun
> %if %{with ashmem}
>@@ -69,3 +79,6 @@
> %{_prefix}/src/anbox-ashmem-%{version}-%{release}
> %endif
> %{_prefix}/src/anbox-binder-%{version}-%{release}
>+%{_udevrulesdir}/99-anbox.rules
>+/etc/modules-load.d/anbox.conf
>+/etc/modprobe.d/anbox-options.conf

Index: SPECS/dkms-anbox.spec
===================================================================
--- SPECS/dkms-anbox.spec	(revisiÃ³n: 2004230)
+++ SPECS/dkms-anbox.spec	(copia de trabajo)
@@ -1,13 +1,12 @@
-%global gitcommit abead1debfae56e8d0307c642865ec23aaa854d3
+%global gitcommit 205c8037e61d4546d8c86c1f789cfaf18fa9bc24
 %global gitcommitshort %(gitcommit=%{gitcommit};echo ${gitcommit:0:8})
 
-%define         subrel 1
-
 #broken on 6.3. kernels and not needed anymore
 %bcond_with 	ashmem
 
 Name:           dkms-anbox
-Version:        0.0.3
+#Use date of commit as version
+Version:        2023.11.01
 Release:        %mkrel 1
 Summary:        Anbox kernel modules for running an Android runtime such as Waydroid
 License:        GPLv3
@@ -14,6 +13,8 @@
 Group:          System/Kernel and hardware
 URL:            https://github.com/choff/anbox-modules
 Source:         https://github.com/choff/anbox-modules/archive/%{gitcommit}/anbox-modules-%{gitcommitshort}.tar.gz
+Patch0:			dkms-anbox-fixrule.patch
+Patch1:			dkms-anbox-disableashmem.patch
 BuildArch:      noarch
 Requires:       dkms
 Provides:       anbox-kmp = %{version}
@@ -29,6 +30,10 @@
 
 %prep
 %setup -q -n anbox-modules-%{gitcommit}
+%patch0 -p1
+%if %{without ashmem}
+%patch1 -p1
+%endif
 
 %build
 # nothing to build
@@ -40,8 +45,11 @@
 cp -r ashmem %{buildroot}/%{_prefix}/src/anbox-ashmem-%{version}-%{release}
 %endif
 cp -r binder %{buildroot}/%{_prefix}/src/anbox-binder-%{version}-%{release}
+install -Dp -m0644 99-anbox.rules %{buildroot}%{_udevrulesdir}/99-anbox.rules
+install -D -m0644 anbox.conf %{buildroot}/etc/modules-load.d/anbox.conf
+echo "options binder_linux devices=binder,hwbinder,vndbinder,anbox-binder,anbox-hwbinder,anbox-vndbinder" > anbox-options.conf
+install -D -m0644 anbox-options.conf %{buildroot}/etc/modprobe.d/anbox-options.conf
 
-
 %post
 %if %{with ashmem}
 if [ -z "$(dkms status -m anbox-ashmem -v %{version}-%{release})" ]; then
@@ -50,12 +58,14 @@
 dkms build -m anbox-ashmem -v %{version}-%{release}
 dkms install -m anbox-ashmem -v %{version}-%{release}
 %endif
-
 if [ -z "$(dkms status -m anbox-binder -v %{version}-%{release})" ]; then
     dkms add -m anbox-binder -v %{version}-%{release} --rpm_safe_upgrade
 fi
 dkms build -m anbox-binder -v %{version}-%{release}
 dkms install -m anbox-binder -v %{version}-%{release}
+if ! lsmod|grep binder ; then
+	/sbin/modprobe binder_linux -v
+fi
 
 %preun
 %if %{with ashmem}
@@ -69,3 +79,6 @@
 %{_prefix}/src/anbox-ashmem-%{version}-%{release}
 %endif
 %{_prefix}/src/anbox-binder-%{version}-%{release}
+%{_udevrulesdir}/99-anbox.rules
+/etc/modules-load.d/anbox.conf
+/etc/modprobe.d/anbox-options.conf

Actions: View | Diff

Attachments on bug 32496: 14133 | 14134 | 14135 | 14136 | 14137 | 14138