Attachment 14397 Details for Bug 32834 – Changes from current spec in mageia 9

[patch] Changes from current spec in mageia 9

dkms-anbox.diff (text/plain), 3.48 KB, created by katnatek on 2024-02-18 19:48:20 CET

(hide)

Description:

Filename:

MIME Type:

Creator: katnatek

Created: 2024-02-18 19:48:20 CET

Size: 3.48 KB

patch

obsolete

>Index: SPECS/dkms-anbox.spec
>===================================================================
>--- SPECS/dkms-anbox.spec	(revision 2042438)
>+++ SPECS/dkms-anbox.spec	(working copy)
>@@ -1,10 +1,10 @@
> %global gitcommit 44e5ba79f515b3cd22d96b4e3ab0f74d5361eb79
> %global gitcommitshort %(gitcommit=%{gitcommit};echo ${gitcommit:0:8})
> 
>-%define         subrel 4
>+%define         subrel 5
> 
> #was broken on 6.3. kernels and not needed anymore
>-%bcond_without 	ashmem
>+%bcond_without  ashmem
> 
> Name:           dkms-anbox
> Version:        0.0.3
>@@ -13,9 +13,11 @@
> License:        GPLv3
> 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
>+Source0:        https://github.com/choff/anbox-modules/archive/%{gitcommit}/anbox-modules-%{gitcommitshort}.tar.gz
>+Source1:        README.install.urpmi
> BuildArch:      noarch
> Requires:       dkms
>+Requires:       dkms-anbox-ashmem
> Provides:       anbox-kmp = %{version}
> BuildRoot:      %{_tmppath}/%{name}-%{version}-build
> 
>@@ -25,8 +27,25 @@
> They are required for running an Android run-time via Anbox or Wayroid on
> kernels compiled without CONFIG_ASHMEM and CONFIG_ANDROID_BINDERFS.
> 
>-See also https://bugs.mageia.org/show_bug.cgi?id=29611
>+You need to manually install dkms-anbox-binder if you need.
> 
>+See also https://bugs.mageia.org/show_bug.cgi?id=29611 , and
>+https://bugs.mageia.org/show_bug.cgi?id=32834
>+
>+%if %{with ashmem}
>+%package  ashmem
>+Summary: ashmen module of dkms-anbox
>+
>+%description ashmem
>+This package contains %{summary}
>+%endif
>+
>+%package  binder
>+Summary: binder module of dkms-anbox
>+
>+%description binder
>+This package contains %{summary}
>+
> %prep
> %setup -q -n anbox-modules-%{gitcommit}
> 
>@@ -43,33 +62,41 @@
> 
> %__install -D -m 644 anbox.conf %{buildroot}%{_modulesloaddir}/anbox.conf
> %__install -D -m 644 99-anbox.rules  %{buildroot}%{_udevrulesdir}/99-anbox.rules
>+install -m644 %{SOURCE1} README.install.urpmi 
> 
>-%post
>+%post binder
>+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}
>+
>+%preun binder
>+dkms remove -m anbox-binder -v %{version}-%{release} --rpm_safe_upgrade --all ||:
>+
> %if %{with ashmem}
>+%post ashmem
> if [ -z "$(dkms status -m anbox-ashmem -v %{version}-%{release})" ]; then
>     dkms add -m anbox-ashmem -v %{version}-%{release} --rpm_safe_upgrade
> fi
> 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}
>-
>-%preun
>-%if %{with ashmem}
>+%preun ashmem
> dkms remove -m anbox-ashmem -v %{version}-%{release} --rpm_safe_upgrade --all ||:
> %endif
>-dkms remove -m anbox-binder -v %{version}-%{release} --rpm_safe_upgrade --all ||:
> 
> %files
> %defattr(-,root,root)
> %config(noreplace) %{_udevrulesdir}/99-anbox.rules
> %config(noreplace) %{_modulesloaddir}/anbox.conf
>+
> %if %{with ashmem}
>+%files ashmem
> %{_prefix}/src/anbox-ashmem-%{version}-%{release}
> %endif
>+
>+%files binder
>+%doc README.install.urpmi 
> %{_prefix}/src/anbox-binder-%{version}-%{release}
>+

Index: SPECS/dkms-anbox.spec
===================================================================
--- SPECS/dkms-anbox.spec	(revision 2042438)
+++ SPECS/dkms-anbox.spec	(working copy)
@@ -1,10 +1,10 @@
 %global gitcommit 44e5ba79f515b3cd22d96b4e3ab0f74d5361eb79
 %global gitcommitshort %(gitcommit=%{gitcommit};echo ${gitcommit:0:8})
 
-%define         subrel 4
+%define         subrel 5
 
 #was broken on 6.3. kernels and not needed anymore
-%bcond_without 	ashmem
+%bcond_without  ashmem
 
 Name:           dkms-anbox
 Version:        0.0.3
@@ -13,9 +13,11 @@
 License:        GPLv3
 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
+Source0:        https://github.com/choff/anbox-modules/archive/%{gitcommit}/anbox-modules-%{gitcommitshort}.tar.gz
+Source1:        README.install.urpmi
 BuildArch:      noarch
 Requires:       dkms
+Requires:       dkms-anbox-ashmem
 Provides:       anbox-kmp = %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -25,8 +27,25 @@
 They are required for running an Android run-time via Anbox or Wayroid on
 kernels compiled without CONFIG_ASHMEM and CONFIG_ANDROID_BINDERFS.
 
-See also https://bugs.mageia.org/show_bug.cgi?id=29611
+You need to manually install dkms-anbox-binder if you need.
 
+See also https://bugs.mageia.org/show_bug.cgi?id=29611 , and
+https://bugs.mageia.org/show_bug.cgi?id=32834
+
+%if %{with ashmem}
+%package  ashmem
+Summary: ashmen module of dkms-anbox
+
+%description ashmem
+This package contains %{summary}
+%endif
+
+%package  binder
+Summary: binder module of dkms-anbox
+
+%description binder
+This package contains %{summary}
+
 %prep
 %setup -q -n anbox-modules-%{gitcommit}
 
@@ -43,33 +62,41 @@
 
 %__install -D -m 644 anbox.conf %{buildroot}%{_modulesloaddir}/anbox.conf
 %__install -D -m 644 99-anbox.rules  %{buildroot}%{_udevrulesdir}/99-anbox.rules
+install -m644 %{SOURCE1} README.install.urpmi 
 
-%post
+%post binder
+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}
+
+%preun binder
+dkms remove -m anbox-binder -v %{version}-%{release} --rpm_safe_upgrade --all ||:
+
 %if %{with ashmem}
+%post ashmem
 if [ -z "$(dkms status -m anbox-ashmem -v %{version}-%{release})" ]; then
     dkms add -m anbox-ashmem -v %{version}-%{release} --rpm_safe_upgrade
 fi
 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}
-
-%preun
-%if %{with ashmem}
+%preun ashmem
 dkms remove -m anbox-ashmem -v %{version}-%{release} --rpm_safe_upgrade --all ||:
 %endif
-dkms remove -m anbox-binder -v %{version}-%{release} --rpm_safe_upgrade --all ||:
 
 %files
 %defattr(-,root,root)
 %config(noreplace) %{_udevrulesdir}/99-anbox.rules
 %config(noreplace) %{_modulesloaddir}/anbox.conf
+
 %if %{with ashmem}
+%files ashmem
 %{_prefix}/src/anbox-ashmem-%{version}-%{release}
 %endif
+
+%files binder
+%doc README.install.urpmi 
 %{_prefix}/src/anbox-binder-%{version}-%{release}
+

Actions: View | Diff

Attachments on bug 32834: 14369 | 14397 | 14398