From 85ea755c563929a78e03e90865801a289c357c60 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 15:48:43 +0100 Subject: [PATCH 1/9] feat: add binder+ashmem modules for waydroid --- includes.container/etc/modules.load.d/waydroid.conf | 2 ++ includes.container/etc/udev/rules.d/99-waydroid.rules | 2 ++ modules/02-waydroid-modules.yml | 10 ++++++++++ recipe.yml | 1 + 4 files changed, 15 insertions(+) create mode 100644 includes.container/etc/modules.load.d/waydroid.conf create mode 100644 includes.container/etc/udev/rules.d/99-waydroid.rules create mode 100644 modules/02-waydroid-modules.yml diff --git a/includes.container/etc/modules.load.d/waydroid.conf b/includes.container/etc/modules.load.d/waydroid.conf new file mode 100644 index 0000000..cb4e8a0 --- /dev/null +++ b/includes.container/etc/modules.load.d/waydroid.conf @@ -0,0 +1,2 @@ +binder_linux +ashmem_linux \ No newline at end of file diff --git a/includes.container/etc/udev/rules.d/99-waydroid.rules b/includes.container/etc/udev/rules.d/99-waydroid.rules new file mode 100644 index 0000000..db9cb79 --- /dev/null +++ b/includes.container/etc/udev/rules.d/99-waydroid.rules @@ -0,0 +1,2 @@ +KERNEL=="binder", NAME="%k", MODE="0666" +KERNEL=="ashmem", NAMe="%k", MODE="0666" \ No newline at end of file diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml new file mode 100644 index 0000000..d350fed --- /dev/null +++ b/modules/02-waydroid-modules.yml @@ -0,0 +1,10 @@ +name: waydroid-modules +type: shell +commands: +- cp -rT /sources/binder /usr/src/waydroid-binder-1 +- cp -rT /sources/ashmem /usr/src/waydroid-ashmem-1 +- dkms install waydroid-binder-1 +- dkms install waydroid-ashmem-1 +source: + type: tar + url: https://github.com/TeMPOraL/nyan-mode/archive/refs/tags/v1.1.3.tar.gz diff --git a/recipe.yml b/recipe.yml index 9709f1c..7f20f0d 100644 --- a/recipe.yml +++ b/recipe.yml @@ -42,6 +42,7 @@ modules: - modules/00-vanilla-system-operator - modules/00-vanilla-apx-gui - modules/01-vanilla-cleanup + - modules/02-waydroid-modules - modules/20-gnome-core - modules/30-gnome-essentials - modules/40-gnome-appearance From 55671a6d56a627df08584dc073330256c0066615 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 15:58:47 +0100 Subject: [PATCH 2/9] Add correct link to waydroid-modules source --- modules/02-waydroid-modules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index d350fed..05ed7a8 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -6,5 +6,5 @@ commands: - dkms install waydroid-binder-1 - dkms install waydroid-ashmem-1 source: - type: tar - url: https://github.com/TeMPOraL/nyan-mode/archive/refs/tags/v1.1.3.tar.gz + type: git + url: https://github.com/choff/anbox-modules.git From a3f9d4e0e2c4aaec96b9e9a1752fcd8554f63777 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 16:03:21 +0100 Subject: [PATCH 3/9] fix: correctly specify git source --- modules/02-waydroid-modules.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index 05ed7a8..ff55303 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -1,10 +1,12 @@ name: waydroid-modules type: shell commands: -- cp -rT /sources/binder /usr/src/waydroid-binder-1 -- cp -rT /sources/ashmem /usr/src/waydroid-ashmem-1 +- cp -rT /sources/waydroid-modules/binder /usr/src/waydroid-binder-1 +- cp -rT /sources/waydroid-modules/ashmem /usr/src/waydroid-ashmem-1 - dkms install waydroid-binder-1 - dkms install waydroid-ashmem-1 source: type: git url: https://github.com/choff/anbox-modules.git + branch: master + commit: latest From d5f34c8e5bd367929592e1102ab68046f9a1bbaa Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 16:09:41 +0100 Subject: [PATCH 4/9] fix: add dkms as dependency for waydroid-modules --- modules/02-waydroid-modules.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index ff55303..20d5440 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -10,3 +10,9 @@ source: url: https://github.com/choff/anbox-modules.git branch: master commit: latest +modules: + - name: waydroid-deps-install + type: apt + source: + packages: + - dkms From e0b09233e131cd9330d4d31270c963b24a0ba401 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 16:37:59 +0100 Subject: [PATCH 5/9] fix: install kernel headers and specify kernel version --- modules/02-waydroid-modules.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index 20d5440..222cf61 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -3,8 +3,8 @@ type: shell commands: - cp -rT /sources/waydroid-modules/binder /usr/src/waydroid-binder-1 - cp -rT /sources/waydroid-modules/ashmem /usr/src/waydroid-ashmem-1 -- dkms install waydroid-binder-1 -- dkms install waydroid-ashmem-1 +- dkms install waydroid-binder-1 -k $(dpkg --list | grep linux-image | grep -Po '[0-9].[0-9].[0-9]' | head -1) +- dkms install waydroid-ashmem-1 -k $(dpkg --list | grep linux-image | grep -Po '[0-9].[0-9].[0-9]' | head -1) source: type: git url: https://github.com/choff/anbox-modules.git @@ -16,3 +16,9 @@ modules: source: packages: - dkms + modules: + - name: dkms-linux-headers + type: shell + commands: + - apt install -y linux-headers-$(dpkg --list | grep linux-image | grep -Po '[0-9].[0-9].[0-9]' | head -1) && apt clean + From 40ea941d53d8fcac2d594afb827e87702a2b0609 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 16:50:10 +0100 Subject: [PATCH 6/9] fix: use linux-headers-amd64 --- modules/02-waydroid-modules.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index 222cf61..b8d1c4e 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -20,5 +20,5 @@ modules: - name: dkms-linux-headers type: shell commands: - - apt install -y linux-headers-$(dpkg --list | grep linux-image | grep -Po '[0-9].[0-9].[0-9]' | head -1) && apt clean + - apt install -y linux-headers-amd64 From fd691f15f4d752c09ce8fbfc6ffeac35ccc378d9 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 17:25:03 +0100 Subject: [PATCH 7/9] fix: use /usr/src to get kernel version --- modules/02-waydroid-modules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index b8d1c4e..252019c 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -3,8 +3,8 @@ type: shell commands: - cp -rT /sources/waydroid-modules/binder /usr/src/waydroid-binder-1 - cp -rT /sources/waydroid-modules/ashmem /usr/src/waydroid-ashmem-1 -- dkms install waydroid-binder-1 -k $(dpkg --list | grep linux-image | grep -Po '[0-9].[0-9].[0-9]' | head -1) -- dkms install waydroid-ashmem-1 -k $(dpkg --list | grep linux-image | grep -Po '[0-9].[0-9].[0-9]' | head -1) +- dkms install waydroid-binder-1 -k $(ls /usr/src | $(grep -Po '[0-9].[0-9].[0-9].*$')) +- dkms install waydroid-ashmem-1 -k $(ls /usr/src | $(grep -Po '[0-9].[0-9].[0-9].*$')) source: type: git url: https://github.com/choff/anbox-modules.git From d8f08aac399a1548070c81bbc696c5da98f0dc3a Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 17:29:56 +0100 Subject: [PATCH 8/9] fix: remove unnecessary $() --- modules/02-waydroid-modules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index 252019c..d876a9f 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -3,8 +3,8 @@ type: shell commands: - cp -rT /sources/waydroid-modules/binder /usr/src/waydroid-binder-1 - cp -rT /sources/waydroid-modules/ashmem /usr/src/waydroid-ashmem-1 -- dkms install waydroid-binder-1 -k $(ls /usr/src | $(grep -Po '[0-9].[0-9].[0-9].*$')) -- dkms install waydroid-ashmem-1 -k $(ls /usr/src | $(grep -Po '[0-9].[0-9].[0-9].*$')) +- dkms install waydroid-binder-1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) +- dkms install waydroid-ashmem-1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) source: type: git url: https://github.com/choff/anbox-modules.git From 42eaddcb7eb50cca4c3eaf8beb57c875b2da4c78 Mon Sep 17 00:00:00 2001 From: axtloss Date: Mon, 1 Jan 2024 18:03:07 +0100 Subject: [PATCH 9/9] Fix: add proper arguments to dkms command --- modules/02-waydroid-modules.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/02-waydroid-modules.yml b/modules/02-waydroid-modules.yml index d876a9f..99d4cbc 100644 --- a/modules/02-waydroid-modules.yml +++ b/modules/02-waydroid-modules.yml @@ -3,8 +3,8 @@ type: shell commands: - cp -rT /sources/waydroid-modules/binder /usr/src/waydroid-binder-1 - cp -rT /sources/waydroid-modules/ashmem /usr/src/waydroid-ashmem-1 -- dkms install waydroid-binder-1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) -- dkms install waydroid-ashmem-1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) +- dkms install waydroid-binder/1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) +- dkms install waydroid-ashmem/1 -k $(ls /usr/src | grep -Po '[0-9].[0-9].[0-9].*$' | head -1) source: type: git url: https://github.com/choff/anbox-modules.git