Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: waydroid-1.2.1
@ 2022-06-19  0:51 JamiKettunen
  2022-06-19  1:25 ` CameronNemo
                   ` (13 more replies)
  0 siblings, 14 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-19  0:51 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 875 bytes --]

There is a new pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture, (`x86_64-glibc` / `x86_64-musl`)

#### To-Do
Test running Waydroid on the following supported archs:
- `i686` (glibc or musl)
- `arm64` (glibc or musl)
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33382 bytes --]

From 40f99b6c7b5fc74c921664d4fca0030671192f6b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 09430986c2df..a44213bc0132 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4165,3 +4165,4 @@ libCore.so root-6.24.06_1
 libCore.so qtcreator-7.0.2_1
 liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 7002c71e1bf1ceedb05ae0a22a9137bc8100c00c Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.20

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 35 +++++++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index a44213bc0132..9224745556d6 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4166,3 +4166,4 @@ libCore.so qtcreator-7.0.2_1
 liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..cef5358ca16d
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,35 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.20
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=fa3a4d1555e1586269d5bcfb5bbe27a3fcfa91f8ed905b16b32e41a7930d606e
+
+# unit tests like to randomly fail: https://github.com/mer-hybris/libgbinder/issues/94
+make_check="no"
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From db63a0715a2b138529e40c3028ae03e6dfb60ce3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From f88d7a5fb51c64674a0335cf41fce7e15442fcb0 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From e2355e41717190be1741e052ce2ec561ec3b013b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 5/8] New package: waydroid-1.2.1

---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 15 +++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..f810bccc7e0b
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,15 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+configured with PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..831dc39292bf
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..508b64431472
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject python3-pyclip lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

From 7076c4a9bbb94509a0de125b18051c92b0ad4345 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 6/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..3500ca74791d 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.4
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 82c0ca9f6ed67f6b51f839a3d729c53d4900b513 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 7/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..b35dfb2577b6 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.47
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From c92db82ce53cad4d3d9d3624d742095a82c2b3b5 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 8/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

[ci skip]
---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..fc3e38b09b0d 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.122
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
@ 2022-06-19  1:25 ` CameronNemo
  2022-06-19  1:42 ` JamiKettunen
                   ` (12 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: CameronNemo @ 2022-06-19  1:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 620 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159594183

Comment:
In the PBP config when I was testing Anbox I used `CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"`, but it seems like you are leaving that blank. Any reason to go one way or the other? Do you expect any issues if I use the PBP config as is? (see relevant configs below)

```
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y
CONFIG_ANDROID_BINDERFS=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
```

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
  2022-06-19  1:25 ` CameronNemo
@ 2022-06-19  1:42 ` JamiKettunen
  2022-06-19  6:35 ` CameronNemo
                   ` (11 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-19  1:42 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 509 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159597224

Comment:
@CameronNemo those would work fine as well; I left `CONFIG_ANDROID_BINDER_DEVICES` as blank as to not cause unnecessary clutter in `/dev` when the binder devices aren't needed (Waydroid automatically manages these via `binderfs`).

Btw enable `CONFIG_ASHMEM` if you can (<=5.17 kernel), without that lots of Android apps unfortunately will crash upon launch :(

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
  2022-06-19  1:25 ` CameronNemo
  2022-06-19  1:42 ` JamiKettunen
@ 2022-06-19  6:35 ` CameronNemo
  2022-06-19  6:36 ` CameronNemo
                   ` (10 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: CameronNemo @ 2022-06-19  6:35 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 277 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159628552

Comment:
Tried on the PBP after adding PSI to the config, and did not get desired results. When activating the UI, just got visual glitches.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (2 preceding siblings ...)
  2022-06-19  6:35 ` CameronNemo
@ 2022-06-19  6:36 ` CameronNemo
  2022-06-19  8:19 ` Johnnynator
                   ` (9 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: CameronNemo @ 2022-06-19  6:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

New comment by CameronNemo on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159628552

Comment:
Tried on the PBP after adding PSI to the config, and did not get desired results. When activating the UI, just got visual glitches. edit: oh and ashmem is indeed enabled.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (3 preceding siblings ...)
  2022-06-19  6:36 ` CameronNemo
@ 2022-06-19  8:19 ` Johnnynator
  2022-06-19 12:45 ` JamiKettunen
                   ` (8 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: Johnnynator @ 2022-06-19  8:19 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 427 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159652114

Comment:
> When activating the UI, just got visual glitches. 

You could enable software rendering to workaround this.

https://docs.waydro.id/faq/get-waydroid-to-work-through-a-vm

I gave it a quick test on a pbp, only issue was this, networking and everything else did seem to work.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (4 preceding siblings ...)
  2022-06-19  8:19 ` Johnnynator
@ 2022-06-19 12:45 ` JamiKettunen
  2022-06-19 19:25 ` JamiKettunen
                   ` (7 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-19 12:45 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 491 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159597224

Comment:
@CameronNemo those would work fine as well; I left `CONFIG_ANDROID_BINDER_DEVICES` as blank as to not cause unnecessary clutter in `/dev` when the binder devices aren't needed (Waydroid automatically manages these via `binderfs`).

Btw enable `CONFIG_ASHMEM` if you can (<=5.17 kernel), without that *some* Android apps may crash upon launch.

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (5 preceding siblings ...)
  2022-06-19 12:45 ` JamiKettunen
@ 2022-06-19 19:25 ` JamiKettunen
  2022-06-19 19:36 ` JamiKettunen
                   ` (6 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-19 19:25 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1361 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159796715

Comment:
@CameronNemo you could perhaps try the [Android 11 images courtesy of aleasto](https://sourceforge.net/projects/aleasto-lineageos/files/LineageOS%2018.1/waydroid_arm64/), they've got mesa 22.1 which could be enough to fix the graphical issues.

Since installing the images seems to be a bit finicky I'd recommend the following to upgrade from the vanilla A10 images you likely `waydroid init`'ed with:
```sh
rm /var/service/waydroid-container
reboot

# in case you already enabled swrast, undo it:
sed -i /var/lib/waydroid/waydroid_base.prop \
    -e '/^ro.hardware.gralloc=/ s/default/gbm/' \
    -e '/^ro.hardware.egl=/ s/swiftshader/mesa/'

images_url=https://sourceforge.net/projects/aleasto-lineageos/files/LineageOS%2018.1/waydroid_arm64
mkdir -p /usr/share/waydroid-extra/images
curl -L $images_url/system.img/download -o /usr/share/waydroid-extra/images/system.img
curl -L $images_url/vendor.img/download -o /usr/share/waydroid-extra/images/vendor.img
sed -i /etc/gbinder.conf /etc/gbinder.d/anbox.conf \
    -e '/^ApiLevel/ s/29/30/' -e 's/aidl2/aidl3/g'
waydroid init -f -i /usr/share/waydroid-extra/images

ln -s /etc/sv/waydroid-container /var/service
```
Let me know how it goes!

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (6 preceding siblings ...)
  2022-06-19 19:25 ` JamiKettunen
@ 2022-06-19 19:36 ` JamiKettunen
  2022-06-20 16:40 ` [PR PATCH] [Updated] " JamiKettunen
                   ` (5 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-19 19:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1325 bytes --]

New comment by JamiKettunen on void-packages repository

https://github.com/void-linux/void-packages/pull/37611#issuecomment-1159796715

Comment:
@CameronNemo you could perhaps try the [Android 11 images courtesy of aleasto](https://sourceforge.net/projects/aleasto-lineageos/files/LineageOS%2018.1/waydroid_arm64/), they've got mesa 22.1 which could be enough to fix the graphical issues.

Since installing the images seems to be a bit finicky I'd recommend the following to upgrade from the vanilla A10 images you likely `waydroid init`'ed with:
```sh
rm /var/service/waydroid-container
reboot

# in case you already enabled swrast, undo it:
sed -i /var/lib/waydroid/waydroid_base.prop \
    -e '/^ro.hardware.gralloc=/ s/default/gbm/' \
    -e '/^ro.hardware.egl=/ s/swiftshader/mesa/'

images_url=https://sourceforge.net/projects/aleasto-lineageos/files/LineageOS%2018.1/waydroid_arm64
mkdir -p /usr/share/waydroid-extra/images
curl -L $images_url/system.img/download -o /usr/share/waydroid-extra/images/system.img
curl -L $images_url/vendor.img/download -o /usr/share/waydroid-extra/images/vendor.img
sed -i /etc/gbinder.conf /etc/gbinder.d/anbox.conf \
    -e '/^ApiLevel/ s/29/30/' -e 's/aidl2/aidl3/g'
waydroid init -f

ln -s /etc/sv/waydroid-container /var/service
```
Let me know how it goes!

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (7 preceding siblings ...)
  2022-06-19 19:36 ` JamiKettunen
@ 2022-06-20 16:40 ` JamiKettunen
  2022-06-20 19:12 ` JamiKettunen
                   ` (4 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-20 16:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture
  - `x86_64-glibc` / `x86_64-musl`
  - `i686` (tested with `linux5.15` & `linux5-18`, both for some odd reason needed a rebuild twice, they failed on `cd ${DESTDIR}/usr/lib/modules/${_kernver}` in their templates initially)
  - `aarch64` (tested by @CameronNemo and @Johnnynator, thanks!)
<img src="https://i.imgur.com/87hRDmj.jpg" width=500 />

#### To-Do
Test running Waydroid on the following supported archs:
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33277 bytes --]

From 9e7affdc898c44c2f4a060ebbed00f8ceb50ca88 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index b1490c5c7535..c8c8cb8b043c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4165,3 +4165,4 @@ libCore.so root-6.24.06_1
 libCore.so qtcreator-7.0.2_1
 liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 44159fb30cd3f123b6831cb09cf1ecaec97f4a85 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.21

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index c8c8cb8b043c..3e733d978f1f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4166,3 +4166,4 @@ libCore.so qtcreator-7.0.2_1
 liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..01f859910a3e
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,32 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.21
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=b6ec73d30ab8b156b199ef291babf9f701da8cb47de45a180dd9538518502c14
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 375bc6d118419cb63d43311c7b0f45b70110dc54 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From a56e5c99182399aa2263a6d38d6b3d2445fd4a59 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From 686f89cdbbee80488585fc9e5670c261e4bf71b7 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 5/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..fc3e38b09b0d 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.122
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 2cac66338bd0a5e2e3c83f3c0d3bc903f05c77f9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 6/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..b35dfb2577b6 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.47
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 20ef50687296b40f4c6ecb9498f76a4d4a1853c3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 7/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..3500ca74791d 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.4
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b0539788eeaeeff12e25d5ad6aaefc6a33ae0279 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 8/8] New package: waydroid-1.2.1

[ci skip]
---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 15 +++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..f810bccc7e0b
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,15 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+configured with PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..ca3afdb35942
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..508b64431472
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject python3-pyclip lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (8 preceding siblings ...)
  2022-06-20 16:40 ` [PR PATCH] [Updated] " JamiKettunen
@ 2022-06-20 19:12 ` JamiKettunen
  2022-06-22 15:36 ` JamiKettunen
                   ` (3 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-20 19:12 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture
  - `x86_64-glibc` / `x86_64-musl`
  - `i686` (tested with `linux5.15` & `linux5-18`, both for some odd reason needed a rebuild twice, they failed on `cd ${DESTDIR}/usr/lib/modules/${_kernver}` in their templates initially)
  - `aarch64` (tested by @CameronNemo and @Johnnynator, thanks!)
<img src="https://i.imgur.com/87hRDmj.jpg" width=500 />

#### To-Do
Test running Waydroid on the following supported archs:
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33384 bytes --]

From 8223b4670bc6f0d8f4db41fa4c1f0f9163678e86 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 62ad879f73f5..43b2442ad17c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4167,3 +4167,4 @@ liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From e072c1b31a70feb500e1d470e918fbc74112c1a1 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.21

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 43b2442ad17c..914aebb7ba32 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..01f859910a3e
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,32 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.21
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=b6ec73d30ab8b156b199ef291babf9f701da8cb47de45a180dd9538518502c14
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 66bb2fc8dda88ae4eeb3133a44ebe98fd77ecb0d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From 7fe626ac80d9d7ae7ad38e7086c0b639a4e70253 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From 0f2a60ebf8ce6b6c6358f3c138c064b675a56cf3 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 5/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..fc3e38b09b0d 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.122
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 011e63fb44c7fbedb57cd8580752f983e632682f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 6/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..b35dfb2577b6 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.47
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 891d22b64b45beac4299246885b8973ae14be5fd Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 7/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..3500ca74791d 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.4
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From b9588015704d3cd343c97247193efaf881a58660 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 8/8] New package: waydroid-1.2.1

[ci skip]
---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 15 +++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 67 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..f810bccc7e0b
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,15 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+configured with PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..ca3afdb35942
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..508b64431472
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject python3-pyclip lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (9 preceding siblings ...)
  2022-06-20 19:12 ` JamiKettunen
@ 2022-06-22 15:36 ` JamiKettunen
  2022-06-23 18:36 ` JamiKettunen
                   ` (2 subsequent siblings)
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-22 15:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture
  - `x86_64-glibc` / `x86_64-musl`
  - `i686` (tested with `linux5.15` & `linux5-18`, both for some odd reason needed a rebuild twice, they failed on `cd ${DESTDIR}/usr/lib/modules/${_kernver}` in their templates initially)
  - `aarch64` (tested by @CameronNemo and @Johnnynator, thanks!)
<img src="https://i.imgur.com/87hRDmj.jpg" width=500 />

#### To-Do
Test running Waydroid on the following supported archs:
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33523 bytes --]

From 37c7530cdb162a135deb8d8c60992e0822ed38bc Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 91d4514ed285..1fca7dd298e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4167,3 +4167,4 @@ liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From b7a7ab88660d6c5f486cf0c6cfc93b80d93cb36b Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.21

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 1fca7dd298e2..e1a297b0035e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..01f859910a3e
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,32 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.21
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=b6ec73d30ab8b156b199ef291babf9f701da8cb47de45a180dd9538518502c14
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 720fbbdbb7bceb3ecdf6181aecc5ca8187320fae Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From 8e69b8b99e364b02016ceeea432e6cf21c91b09e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From 7adc359cf4a06e25006296ef737b5a7e632d70f0 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 5/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..fc3e38b09b0d 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.122
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From ee8228ca8ff3a970e19dcd65a870d4b5da1d9de8 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 6/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..b35dfb2577b6 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.47
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 0cb0cbb58c1bef428027096dbf43207e854eb433 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 7/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..3500ca74791d 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.4
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From e505cfc18d232be7643f45e54b1b8283d888a642 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 8/8] New package: waydroid-1.2.1

[ci skip]
---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 20 ++++++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..b3b7053b3d29
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,20 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+configured with PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
+
+Optionally clipboard syncing between the container and host Wayland compositor
+can be enabled with:
+
+	# xbps-install python3-pyclip wl-clipboard
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..ca3afdb35942
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..be9c15c6bbb9
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (10 preceding siblings ...)
  2022-06-22 15:36 ` JamiKettunen
@ 2022-06-23 18:36 ` JamiKettunen
  2022-06-24 21:13 ` JamiKettunen
  2022-06-25 20:40 ` JamiKettunen
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-23 18:36 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture
  - `x86_64-glibc` / `x86_64-musl`
  - `i686` (tested with `linux5.15` & `linux5-18`, both for some odd reason needed a rebuild twice, they failed on `cd ${DESTDIR}/usr/lib/modules/${_kernver}` in their templates initially)
  - `aarch64` (tested by @CameronNemo and @Johnnynator, thanks!)
<img src="https://i.imgur.com/87hRDmj.jpg" width=500 />

#### To-Do
Test running Waydroid on the following supported archs:
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33523 bytes --]

From 5f5ed85cdf521283db9bfa0b9d76271979923fcc Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 91d4514ed285..1fca7dd298e2 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4167,3 +4167,4 @@ liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From e430e7acc74b17cfe732524910bb6590b074c87e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.23

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 1fca7dd298e2..e1a297b0035e 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..70d44dd937e9
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,32 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.23
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=6ad89cf649bd6a50b64d1ab7f0ddd8cb1b7656189d7440c233f2d6eaa332aaa5
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 576113f8d9522fcdce9bad6faf93b58c43706f53 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From 44d0e5461bff041f1fec0a2a561f825fbf57e259 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From 3910ae94e0dd61ba53e4dac28f9201dc4e1d8448 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 5/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..fc3e38b09b0d 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.122
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 906814aa3e9643fb5c6d522599a54f3ecbbb7c5e Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 6/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..b35dfb2577b6 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.47
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 6408b3fed495d1d0a8333205490f901424e92dbb Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 7/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..3500ca74791d 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.4
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 9ebc85a96c83f00b091a487a7a331eeda7ac711c Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 8/8] New package: waydroid-1.2.1

[ci skip]
---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 20 ++++++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 72 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..b3b7053b3d29
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,20 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+configured with PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
+
+Optionally clipboard syncing between the container and host Wayland compositor
+can be enabled with:
+
+	# xbps-install python3-pyclip wl-clipboard
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..ca3afdb35942
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..be9c15c6bbb9
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (11 preceding siblings ...)
  2022-06-23 18:36 ` JamiKettunen
@ 2022-06-24 21:13 ` JamiKettunen
  2022-06-25 20:40 ` JamiKettunen
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-24 21:13 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture
  - `x86_64-glibc` / `x86_64-musl`
  - `i686` (tested with `linux5.15` & `linux5-18`, both for some odd reason needed a rebuild twice, they failed on `cd ${DESTDIR}/usr/lib/modules/${_kernver}` in their templates initially)
  - `aarch64` (tested by @CameronNemo and @Johnnynator, thanks!)
<img src="https://i.imgur.com/87hRDmj.jpg" width=500 />

#### To-Do
Test running Waydroid on the following supported archs:
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33838 bytes --]

From 241ab98fbd6f29aa3a1faec1a1d15211b1fd0612 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 93c350e14ac0..4e93da595366 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4167,3 +4167,4 @@ liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From f5b0855ef5f4fc7e4218cce491f355a762eaa240 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.23

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 4e93da595366..2caa9254325d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4168,3 +4168,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..70d44dd937e9
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,32 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.23
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=6ad89cf649bd6a50b64d1ab7f0ddd8cb1b7656189d7440c233f2d6eaa332aaa5
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 741b08e48deaf767ef237aeabfd8d1978e0a0b2f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From 826951d90e004eac47f6e98c81e47ec79b935373 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From 4d8ca6bbc25bb6a68fa5e6a6bba10d3dc8733a7d Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 5/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 144424658757..fc3e38b09b0d 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.122
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 374f893e1965e03037b63911e779b37d955f8a9f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 6/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a3d4cc99dbd2..b35dfb2577b6 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.47
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 3875a2a337bc10e91b049d95f3401402f3648e28 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 7/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index 44b7162ebc70..3500ca74791d 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.4
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From fb3bb42f7f1b0de0cf64f287a2b955f36c0c4035 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 8/8] New package: waydroid-1.2.1

[ci skip]
---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 28 +++++++++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 80 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..8efc5ff2ccce
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,28 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+it's configured with CONFIG_PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+In case of graphical rendering issues you can try enabling software rendering
+(instead of using Mesa):
+
+	# sed -i /var/lib/waydroid/waydroid_base.prop \
+	      -e '/^ro.hardware.gralloc=/ s/gbm/default/' \
+	      -e '/^ro.hardware.egl=/ s/mesa/swiftshader/'
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
+
+Optionally clipboard syncing between the container and host Wayland compositor
+can be enabled with:
+
+	# xbps-install python3-pyclip wl-clipboard
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..ca3afdb35942
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..be9c15c6bbb9
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

^ permalink raw reply	[flat|nested] 15+ messages in thread

* Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
  2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
                   ` (12 preceding siblings ...)
  2022-06-24 21:13 ` JamiKettunen
@ 2022-06-25 20:40 ` JamiKettunen
  13 siblings, 0 replies; 15+ messages in thread
From: JamiKettunen @ 2022-06-25 20:40 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 1142 bytes --]

There is an updated pull request by JamiKettunen against master on the void-packages repository

https://github.com/JamiKettunen/void-packages waydroid
https://github.com/void-linux/void-packages/pull/37611

New package: waydroid-1.2.1
#### Testing the changes
- I tested the changes in this PR: **YES**

#### New package
- This new package conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements): **YES**

#### Local build testing
- I built this PR locally for my native architecture
  - `x86_64-glibc` / `x86_64-musl`
  - `i686` (tested with `linux5.15` & `linux5-18`, both for some odd reason needed a rebuild twice, they failed on `cd ${DESTDIR}/usr/lib/modules/${_kernver}` in their templates initially)
  - `aarch64` (tested by @CameronNemo and @Johnnynator, thanks!)
<img src="https://i.imgur.com/87hRDmj.jpg" width=500 />

#### To-Do
Test running Waydroid on the following supported archs:
- `armv7l` (glibc or musl)

Supersedes #33135 and closes #33133.

A patch file from https://github.com/void-linux/void-packages/pull/37611.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-37611.patch --]
[-- Type: text/x-diff, Size: 33838 bytes --]

From eefb342a8fd46c7a2969e1030fa4eaf609f11807 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:14:05 +0300
Subject: [PATCH 1/8] New package: libglibutil-1.0.65

---
 common/shlibs                |  1 +
 srcpkgs/libglibutil-devel    |  1 +
 srcpkgs/libglibutil/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libglibutil-devel
 create mode 100644 srcpkgs/libglibutil/template

diff --git a/common/shlibs b/common/shlibs
index 8231f48d36a3..79ab015e4670 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4164,3 +4164,4 @@ liblowdown.so lowdown-0.11.2_1
 libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
+libglibutil.so.1 libglibutil-1.0.64_1
diff --git a/srcpkgs/libglibutil-devel b/srcpkgs/libglibutil-devel
new file mode 120000
index 000000000000..f4da4cebe81f
--- /dev/null
+++ b/srcpkgs/libglibutil-devel
@@ -0,0 +1 @@
+libglibutil
\ No newline at end of file
diff --git a/srcpkgs/libglibutil/template b/srcpkgs/libglibutil/template
new file mode 100644
index 000000000000..eb129a7cea27
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,32 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.65
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_check_target="test"
+make_install_target="install-dev"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/sailfishos/libglibutil"
+distfiles="https://github.com/sailfishos/libglibutil/archive/refs/tags/${version}.tar.gz"
+checksum=18a7b4abeacd455d2ac1ea82209dd7f32be9098f989b5a886dc059c0ab22d1b0
+
+post_install() {
+	vlicense LICENSE
+}
+
+libglibutil-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} glib-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 8868e158bf7458a87e550f810add8c837637faf9 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:35:35 +0300
Subject: [PATCH 2/8] New package: libgbinder-1.1.23

---
 common/shlibs               |  1 +
 srcpkgs/libgbinder-devel    |  1 +
 srcpkgs/libgbinder/template | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 120000 srcpkgs/libgbinder-devel
 create mode 100644 srcpkgs/libgbinder/template

diff --git a/common/shlibs b/common/shlibs
index 79ab015e4670..164c996411ae 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -4165,3 +4165,4 @@ libjaylink.so.0 libjaylink-0.2.0_1
 libnvidia-container.so.1 libnvidia-container-1.10.0_1
 libnvidia-container-go.so.1 libnvidia-container-1.10.0_1
 libglibutil.so.1 libglibutil-1.0.64_1
+libgbinder.so.1 libgbinder-1.1.20_1
diff --git a/srcpkgs/libgbinder-devel b/srcpkgs/libgbinder-devel
new file mode 120000
index 000000000000..f31e2e6dbb52
--- /dev/null
+++ b/srcpkgs/libgbinder-devel
@@ -0,0 +1 @@
+libgbinder
\ No newline at end of file
diff --git a/srcpkgs/libgbinder/template b/srcpkgs/libgbinder/template
new file mode 100644
index 000000000000..70d44dd937e9
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,32 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.23
+revision=1
+build_style=gnu-makefile
+make_use_env=1
+make_build_args="KEEP_SYMBOLS=1"
+make_build_target="release pkgconfig"
+make_install_target="install-dev"
+make_check_target="test"
+hostmakedepends="pkg-config bison flex"
+makedepends="libglibutil-devel"
+short_desc="GLib-style interface to binder (Android IPC mechanism)"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="BSD-3-Clause"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/refs/tags/${version}.tar.gz"
+checksum=6ad89cf649bd6a50b64d1ab7f0ddd8cb1b7656189d7440c233f2d6eaa332aaa5
+
+post_install() {
+	vlicense LICENSE
+}
+
+libgbinder-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision} libglibutil-devel"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+	}
+}

From 4e344b4a32ff1a642e1660f620ea101d7a2677d0 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:43:17 +0300
Subject: [PATCH 3/8] New package: gbinder-python-1.0.0

---
 srcpkgs/gbinder-python/template | 15 +++++++++++++++
 1 file changed, 15 insertions(+)
 create mode 100644 srcpkgs/gbinder-python/template

diff --git a/srcpkgs/gbinder-python/template b/srcpkgs/gbinder-python/template
new file mode 100644
index 000000000000..39a56fa44513
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,15 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=1.0.0
+revision=1
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+depends="python3"
+short_desc="Python bindings for libgbinder"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/refs/tags/${version}.tar.gz"
+checksum=02f35e75ef3e7fbca1a15d3307339ef1a476ea078e7b8cb73b2e5bcfce65434d

From 9a7187de042cc9551192df8571c456726d0c647f Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 16:57:32 +0300
Subject: [PATCH 4/8] New package: python3-pyclip-0.6.0

---
 srcpkgs/python3-pyclip/template | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 srcpkgs/python3-pyclip/template

diff --git a/srcpkgs/python3-pyclip/template b/srcpkgs/python3-pyclip/template
new file mode 100644
index 000000000000..93f5ffb2547c
--- /dev/null
+++ b/srcpkgs/python3-pyclip/template
@@ -0,0 +1,17 @@
+# Template file for 'python3-pyclip'
+pkgname=python3-pyclip
+version=0.6.0
+revision=1
+wrksrc="pyclip-${version}"
+build_style=python3-module
+hostmakedepends="python3-setuptools"
+depends="python3"
+short_desc="Cross-platform Clipboard module for Python"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="Apache-2.0"
+homepage="https://github.com/spyoungtech/pyclip"
+distfiles="https://github.com/spyoungtech/pyclip/archive/refs/tags/v${version}.tar.gz"
+checksum=60b02c936dd8e24dc4e4a15f09e5f1e9b49bcde7e032da120630ab1d74c5fa16
+
+# tests are broken due to "pyclip: error: argument command: invalid choice: 'test' (choose from 'copy', 'paste', 'clear')"
+make_check="no"

From ba2341e61bd8c57f983e9af794508746956d8b29 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:15:28 +0300
Subject: [PATCH 5/8] linux5.10: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.10/files/arm64-dotconfig  | 52 ++++++++++++----------
 srcpkgs/linux5.10/files/i386-dotconfig   | 47 +++++++++++---------
 srcpkgs/linux5.10/files/x86_64-dotconfig | 55 +++++++++++++-----------
 srcpkgs/linux5.10/template               |  2 +-
 4 files changed, 88 insertions(+), 68 deletions(-)

diff --git a/srcpkgs/linux5.10/files/arm64-dotconfig b/srcpkgs/linux5.10/files/arm64-dotconfig
index acfc37c03510..07283dcd1ce0 100644
--- a/srcpkgs/linux5.10/files/arm64-dotconfig
+++ b/srcpkgs/linux5.10/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.10.105 Kernel Configuration
+# Linux/arm64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -4006,7 +4006,6 @@ CONFIG_USB4_NET=m
 CONFIG_NETDEVSIM=m
 CONFIG_NET_FAILOVER=m
 # CONFIG_ISDN is not set
-# CONFIG_NVM is not set
 
 #
 # Input device support
@@ -8807,6 +8806,8 @@ CONFIG_VIDEO_ROCKCHIP_ISP1=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10195,7 +10196,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -10889,26 +10894,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11023,6 +11008,27 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/i386-dotconfig b/srcpkgs/linux5.10/files/i386-dotconfig
index 70d61a837efd..4f03a54fe287 100644
--- a/srcpkgs/linux5.10/files/i386-dotconfig
+++ b/srcpkgs/linux5.10/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.10.115 Kernel Configuration
+# Linux/i386 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7818,6 +7818,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8750,7 +8752,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9420,24 +9426,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9503,6 +9491,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/files/x86_64-dotconfig b/srcpkgs/linux5.10/files/x86_64-dotconfig
index 1a5057ad0234..a1ec2579bee8 100644
--- a/srcpkgs/linux5.10/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.10/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.10.115 Kernel Configuration
+# Linux/x86_64 5.10.122 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -7940,6 +7940,8 @@ CONFIG_VIDEO_IPU3_IMGU=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
+# CONFIG_ION is not set
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -8891,7 +8893,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9597,28 +9603,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9686,6 +9670,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.10/template b/srcpkgs/linux5.10/template
index 781879543adc..ea229846341a 100644
--- a/srcpkgs/linux5.10/template
+++ b/srcpkgs/linux5.10/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.10'
 pkgname=linux5.10
 version=5.10.125
-revision=1
+revision=2
 wrksrc="linux-${version}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From d4d5c0eaeaff3555092287e1fa5370baad7d7970 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 02:07:12 +0300
Subject: [PATCH 6/8] linux5.15: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.15/files/arm64-dotconfig  | 74 +++++++++++++-----------
 srcpkgs/linux5.15/files/i386-dotconfig   | 46 ++++++++-------
 srcpkgs/linux5.15/files/x86_64-dotconfig | 54 +++++++++--------
 srcpkgs/linux5.15/template               |  2 +-
 4 files changed, 96 insertions(+), 80 deletions(-)

diff --git a/srcpkgs/linux5.15/files/arm64-dotconfig b/srcpkgs/linux5.15/files/arm64-dotconfig
index d086ed216153..e8fa12067f73 100644
--- a/srcpkgs/linux5.15/files/arm64-dotconfig
+++ b/srcpkgs/linux5.15/files/arm64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.15.28 Kernel Configuration
+# Linux/arm64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="aarch64-linux-musl-gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -414,7 +414,6 @@ CONFIG_HZ=100
 CONFIG_SCHED_HRTICK=y
 CONFIG_ARCH_SPARSEMEM_ENABLE=y
 CONFIG_HW_PERF_EVENTS=y
-CONFIG_ARCH_HAS_FILTER_PGPROT=y
 CONFIG_PARAVIRT=y
 # CONFIG_PARAVIRT_TIME_ACCOUNTING is not set
 CONFIG_KEXEC=y
@@ -798,7 +797,6 @@ CONFIG_ARCH_USE_MEMREMAP_PROT=y
 # CONFIG_LOCK_EVENT_COUNTS is not set
 CONFIG_ARCH_HAS_RELR=y
 CONFIG_ARCH_WANT_LD_ORPHAN_WARN=y
-CONFIG_HAVE_ARCH_PFN_VALID=y
 CONFIG_ARCH_SUPPORTS_DEBUG_PAGEALLOC=y
 
 #
@@ -3320,8 +3318,6 @@ CONFIG_BNXT_SRIOV=y
 CONFIG_BNXT_FLOWER_OFFLOAD=y
 CONFIG_BNXT_DCB=y
 CONFIG_BNXT_HWMON=y
-CONFIG_NET_VENDOR_BROCADE=y
-CONFIG_BNA=m
 CONFIG_NET_VENDOR_CADENCE=y
 CONFIG_MACB=m
 CONFIG_MACB_USE_HWSTAMP=y
@@ -3437,7 +3433,6 @@ CONFIG_I40EVF=m
 CONFIG_ICE=m
 CONFIG_FM10K=m
 CONFIG_IGC=m
-CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_JME=m
 CONFIG_NET_VENDOR_LITEX=y
 CONFIG_LITEX_LITEETH=m
@@ -3515,9 +3510,12 @@ CONFIG_SPARX5_SWITCH=m
 CONFIG_NET_VENDOR_MICROSEMI=y
 CONFIG_MSCC_OCELOT_SWITCH_LIB=m
 CONFIG_MSCC_OCELOT_SWITCH=m
+CONFIG_NET_VENDOR_MICROSOFT=y
 CONFIG_NET_VENDOR_MYRI=y
 CONFIG_MYRI10GE=m
 CONFIG_FEALNX=m
+CONFIG_NET_VENDOR_NI=y
+CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_NATSEMI=y
 CONFIG_NATSEMI=m
 CONFIG_NS83820=m
@@ -3530,8 +3528,6 @@ CONFIG_NFP=m
 CONFIG_NFP_APP_FLOWER=y
 CONFIG_NFP_APP_ABM_NIC=y
 # CONFIG_NFP_DEBUG is not set
-CONFIG_NET_VENDOR_NI=y
-CONFIG_NI_XGE_MANAGEMENT_ENET=m
 CONFIG_NET_VENDOR_8390=y
 CONFIG_PCMCIA_AXNET=m
 CONFIG_NE2K_PCI=m
@@ -3560,6 +3556,8 @@ CONFIG_QED_RDMA=y
 CONFIG_QED_ISCSI=y
 CONFIG_QED_FCOE=y
 CONFIG_QED_OOO=y
+CONFIG_NET_VENDOR_BROCADE=y
+CONFIG_BNA=m
 CONFIG_NET_VENDOR_QUALCOMM=y
 CONFIG_QCA7000=m
 CONFIG_QCA7000_SPI=m
@@ -3582,6 +3580,11 @@ CONFIG_ROCKER=m
 CONFIG_NET_VENDOR_SAMSUNG=y
 CONFIG_SXGBE_ETH=m
 CONFIG_NET_VENDOR_SEEQ=y
+CONFIG_NET_VENDOR_SILAN=y
+CONFIG_SC92031=m
+CONFIG_NET_VENDOR_SIS=y
+CONFIG_SIS900=m
+CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SOLARFLARE=y
 CONFIG_SFC=m
 CONFIG_SFC_MTD=y
@@ -3590,11 +3593,6 @@ CONFIG_SFC_SRIOV=y
 CONFIG_SFC_MCDI_LOGGING=y
 CONFIG_SFC_FALCON=m
 CONFIG_SFC_FALCON_MTD=y
-CONFIG_NET_VENDOR_SILAN=y
-CONFIG_SC92031=m
-CONFIG_NET_VENDOR_SIS=y
-CONFIG_SIS900=m
-CONFIG_SIS190=m
 CONFIG_NET_VENDOR_SMSC=y
 CONFIG_SMC91X=m
 CONFIG_PCMCIA_SMC91C92=m
@@ -9192,6 +9190,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 # CONFIG_STAGING_BOARD is not set
@@ -10689,7 +10688,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
@@ -11400,27 +11403,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
-CONFIG_CRYPTO_LIB_SM4=m
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_ALLWINNER=y
 CONFIG_CRYPTO_DEV_SUN4I_SS=m
@@ -11545,6 +11527,28 @@ CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
 CONFIG_INDIRECT_PIO=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=9
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+CONFIG_CRYPTO_LIB_SM4=m
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=y
 CONFIG_CRC16=y
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/i386-dotconfig b/srcpkgs/linux5.15/files/i386-dotconfig
index 0e497896cbbb..def230b5d9f1 100644
--- a/srcpkgs/linux5.15/files/i386-dotconfig
+++ b/srcpkgs/linux5.15/files/i386-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/i386 5.15.39 Kernel Configuration
+# Linux/i386 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8053,6 +8053,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9038,7 +9039,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
@@ -9718,24 +9723,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -9802,6 +9789,25 @@ CONFIG_GENERIC_PCI_IOMAP=y
 CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=1
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/files/x86_64-dotconfig b/srcpkgs/linux5.15/files/x86_64-dotconfig
index 32714ae96633..1406c618bbba 100644
--- a/srcpkgs/linux5.15/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.15/files/x86_64-dotconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86_64 5.15.39 Kernel Configuration
+# Linux/x86_64 5.15.47 Kernel Configuration
 #
 CONFIG_CC_VERSION_TEXT="gcc (GCC) 10.2.1 20201203"
 CONFIG_CC_IS_GCC=y
@@ -8188,6 +8188,7 @@ CONFIG_DVB_SP8870=m
 #
 # Android
 #
+CONFIG_ASHMEM=y
 # end of Android
 
 CONFIG_LTE_GDM724X=m
@@ -9203,7 +9204,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
@@ -9924,28 +9929,6 @@ CONFIG_CRYPTO_USER_API_AEAD=m
 CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=y
 # CONFIG_CRYPTO_STATS is not set
 CONFIG_CRYPTO_HASH_INFO=y
-
-#
-# Crypto library routines
-#
-CONFIG_CRYPTO_LIB_AES=y
-CONFIG_CRYPTO_LIB_ARC4=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=m
-CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=m
-CONFIG_CRYPTO_LIB_BLAKE2S=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
-CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
-CONFIG_CRYPTO_LIB_CHACHA=m
-CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
-CONFIG_CRYPTO_LIB_CURVE25519=m
-CONFIG_CRYPTO_LIB_DES=m
-CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
-CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
-CONFIG_CRYPTO_LIB_POLY1305=m
-CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
-CONFIG_CRYPTO_LIB_SHA256=y
 CONFIG_CRYPTO_HW=y
 CONFIG_CRYPTO_DEV_PADLOCK=m
 CONFIG_CRYPTO_DEV_PADLOCK_AES=m
@@ -10014,6 +9997,29 @@ CONFIG_GENERIC_IOMAP=y
 CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y
 CONFIG_ARCH_HAS_FAST_MULTIPLIER=y
 CONFIG_ARCH_USE_SYM_ANNOTATIONS=y
+
+#
+# Crypto library routines
+#
+CONFIG_CRYPTO_LIB_AES=y
+CONFIG_CRYPTO_LIB_ARC4=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_BLAKE2S=y
+CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CHACHA=m
+CONFIG_CRYPTO_LIB_CHACHA_GENERIC=m
+CONFIG_CRYPTO_LIB_CHACHA=m
+CONFIG_CRYPTO_ARCH_HAVE_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_CURVE25519_GENERIC=m
+CONFIG_CRYPTO_LIB_CURVE25519=m
+CONFIG_CRYPTO_LIB_DES=m
+CONFIG_CRYPTO_LIB_POLY1305_RSIZE=11
+CONFIG_CRYPTO_ARCH_HAVE_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_POLY1305_GENERIC=m
+CONFIG_CRYPTO_LIB_POLY1305=m
+CONFIG_CRYPTO_LIB_CHACHA20POLY1305=m
+CONFIG_CRYPTO_LIB_SHA256=y
+# end of Crypto library routines
+
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
 CONFIG_CRC_T10DIF=y
diff --git a/srcpkgs/linux5.15/template b/srcpkgs/linux5.15/template
index a54741bf8478..4926df68fc35 100644
--- a/srcpkgs/linux5.15/template
+++ b/srcpkgs/linux5.15/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.15'
 pkgname=linux5.15
 version=5.15.50
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From 1103d16e11ed0c13b3ff1b777ef1c2a43c45adbb Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Sun, 19 Jun 2022 01:50:50 +0300
Subject: [PATCH 7/8] linux5.18: add Waydroid configs for
 {arm64,i386,x86_64}-dotconfig

---
 srcpkgs/linux5.18/files/arm64-dotconfig  | 6 +++++-
 srcpkgs/linux5.18/files/i386-dotconfig   | 6 +++++-
 srcpkgs/linux5.18/files/x86_64-dotconfig | 6 +++++-
 srcpkgs/linux5.18/template               | 2 +-
 4 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/linux5.18/files/arm64-dotconfig b/srcpkgs/linux5.18/files/arm64-dotconfig
index 7598bc1a7d1d..14a77fcf9882 100644
--- a/srcpkgs/linux5.18/files/arm64-dotconfig
+++ b/srcpkgs/linux5.18/files/arm64-dotconfig
@@ -11040,7 +11040,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=m
diff --git a/srcpkgs/linux5.18/files/i386-dotconfig b/srcpkgs/linux5.18/files/i386-dotconfig
index 04df1c4e5f69..515d928629f6 100644
--- a/srcpkgs/linux5.18/files/i386-dotconfig
+++ b/srcpkgs/linux5.18/files/i386-dotconfig
@@ -9349,7 +9349,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 # CONFIG_LIBNVDIMM is not set
diff --git a/srcpkgs/linux5.18/files/x86_64-dotconfig b/srcpkgs/linux5.18/files/x86_64-dotconfig
index a45246a486ec..8c4a81f1e3a5 100644
--- a/srcpkgs/linux5.18/files/x86_64-dotconfig
+++ b/srcpkgs/linux5.18/files/x86_64-dotconfig
@@ -9529,7 +9529,11 @@ CONFIG_USB4=m
 #
 # Android
 #
-# CONFIG_ANDROID is not set
+CONFIG_ANDROID=y
+CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
+CONFIG_ANDROID_BINDER_DEVICES=""
+# CONFIG_ANDROID_BINDER_IPC_SELFTEST is not set
 # end of Android
 
 CONFIG_LIBNVDIMM=y
diff --git a/srcpkgs/linux5.18/template b/srcpkgs/linux5.18/template
index be6582401d64..83f7cefcced1 100644
--- a/srcpkgs/linux5.18/template
+++ b/srcpkgs/linux5.18/template
@@ -1,7 +1,7 @@
 # Template file for 'linux5.18'
 pkgname=linux5.18
 version=5.18.7
-revision=1
+revision=2
 wrksrc="linux-${version%.*}"
 short_desc="Linux kernel and modules (${version%.*} series)"
 maintainer="Leah Neukirchen <leah@vuxu.org>"

From f7a202d236a0e8cf5d801da0513e535892528693 Mon Sep 17 00:00:00 2001
From: Jami Kettunen <jami.kettunen@protonmail.com>
Date: Wed, 15 Jun 2022 23:28:05 +0300
Subject: [PATCH 8/8] New package: waydroid-1.2.1

[ci skip]
---
 srcpkgs/waydroid/INSTALL.msg                  |  2 +
 srcpkgs/waydroid/REMOVE.msg                   |  4 ++
 srcpkgs/waydroid/files/README.voidlinux       | 28 +++++++++++++
 srcpkgs/waydroid/files/gbinder.conf           |  2 +
 .../waydroid/files/waydroid-container/finish  |  3 ++
 srcpkgs/waydroid/files/waydroid-container/run |  2 +
 srcpkgs/waydroid/template                     | 39 +++++++++++++++++++
 7 files changed, 80 insertions(+)
 create mode 100644 srcpkgs/waydroid/INSTALL.msg
 create mode 100644 srcpkgs/waydroid/REMOVE.msg
 create mode 100644 srcpkgs/waydroid/files/README.voidlinux
 create mode 100644 srcpkgs/waydroid/files/gbinder.conf
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/finish
 create mode 100644 srcpkgs/waydroid/files/waydroid-container/run
 create mode 100644 srcpkgs/waydroid/template

diff --git a/srcpkgs/waydroid/INSTALL.msg b/srcpkgs/waydroid/INSTALL.msg
new file mode 100644
index 000000000000..b5e984dc3de7
--- /dev/null
+++ b/srcpkgs/waydroid/INSTALL.msg
@@ -0,0 +1,2 @@
+Consult /usr/share/doc/waydroid/README.voidlinux for further installation
+instructions and troubleshooting information.
diff --git a/srcpkgs/waydroid/REMOVE.msg b/srcpkgs/waydroid/REMOVE.msg
new file mode 100644
index 000000000000..bdfb4fe5d36d
--- /dev/null
+++ b/srcpkgs/waydroid/REMOVE.msg
@@ -0,0 +1,4 @@
+To finish Waydroid uninstallation (including removal of user data), run:
+
+	# rm -rf /home/<user>/.local/share/{,applications/}waydroid* /var/{lib,service}/waydroid*
+
diff --git a/srcpkgs/waydroid/files/README.voidlinux b/srcpkgs/waydroid/files/README.voidlinux
new file mode 100644
index 000000000000..8efc5ff2ccce
--- /dev/null
+++ b/srcpkgs/waydroid/files/README.voidlinux
@@ -0,0 +1,28 @@
+To finish Waydroid installation run:
+
+	# waydroid init
+	# ln -s /etc/sv/waydroid-container /var/service
+
+Additionally ensure 'psi=1' is present on your kernel cmdline (unless
+it's configured with CONFIG_PSI_DEFAULT_DISABLED=n).
+
+On 5.18+ kernels ashmem usage needs to manually be disabled for now:
+
+	# echo 'sys.use_memfd=true' >> /var/lib/waydroid/waydroid_base.prop
+	# sv restart waydroid-container
+
+In case of graphical rendering issues you can try enabling software rendering
+(instead of using Mesa):
+
+	# sed -i /var/lib/waydroid/waydroid_base.prop \
+	      -e '/^ro.hardware.gralloc=/ s/gbm/default/' \
+	      -e '/^ro.hardware.egl=/ s/mesa/swiftshader/'
+	# sv restart waydroid-container
+
+If not sure confirm your /proc/cpuinfo has the instruction sets required
+by Android: https://developer.android.com/ndk/guides/abis#sa
+
+Optionally clipboard syncing between the container and host Wayland compositor
+can be enabled with:
+
+	# xbps-install python3-pyclip wl-clipboard
diff --git a/srcpkgs/waydroid/files/gbinder.conf b/srcpkgs/waydroid/files/gbinder.conf
new file mode 100644
index 000000000000..a95692feb37f
--- /dev/null
+++ b/srcpkgs/waydroid/files/gbinder.conf
@@ -0,0 +1,2 @@
+[General]
+ApiLevel = 29
diff --git a/srcpkgs/waydroid/files/waydroid-container/finish b/srcpkgs/waydroid/files/waydroid-container/finish
new file mode 100644
index 000000000000..73b10fd8e07a
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/finish
@@ -0,0 +1,3 @@
+#!/bin/sh
+waydroid session stop
+waydroid container stop
diff --git a/srcpkgs/waydroid/files/waydroid-container/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100644
index 000000000000..ca3afdb35942
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec waydroid container start
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..be9c15c6bbb9
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,39 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=1.2.1
+revision=1
+# https://developer.android.com/ndk/guides/abis#sa
+archs="aarch64* armv7* i686* x86_64*"
+# the following may be edited to e.g. run a newer Android system image
+conf_files="/etc/gbinder.conf /etc/gbinder.d/anbox.conf"
+depends="python3 gbinder-python python3-gobject lxc dnsmasq"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="Jami Kettunen <jami.kettunen@protonmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/refs/tags/${version}.tar.gz"
+checksum=cd9e1c541e1b55329e64f080060974396532474299e708641c587326697fb093
+
+python_version=3
+pycompile_dirs="usr/lib/waydroid"
+
+do_install() {
+	vmkdir usr/lib/waydroid
+	vcopy data usr/lib/waydroid
+	vcopy tools usr/lib/waydroid
+
+	vinstall waydroid.py 755 usr/lib/waydroid
+	vmkdir usr/bin
+	ln -sr ${DESTDIR}/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+	vinstall gbinder/anbox.conf 644 etc/gbinder.d/
+	vinstall ${FILESDIR}/gbinder.conf 644 etc/
+
+	vmkdir usr/share/applications
+	ln -sr ${DESTDIR}/usr/lib/waydroid/data/Waydroid.desktop ${DESTDIR}/usr/share/applications
+
+	vsv waydroid-container
+
+	# Void-specific documentation
+	vdoc ${FILESDIR}/README.voidlinux
+}

^ permalink raw reply	[flat|nested] 15+ messages in thread

end of thread, other threads:[~2022-06-25 20:40 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-06-19  0:51 [PR PATCH] New package: waydroid-1.2.1 JamiKettunen
2022-06-19  1:25 ` CameronNemo
2022-06-19  1:42 ` JamiKettunen
2022-06-19  6:35 ` CameronNemo
2022-06-19  6:36 ` CameronNemo
2022-06-19  8:19 ` Johnnynator
2022-06-19 12:45 ` JamiKettunen
2022-06-19 19:25 ` JamiKettunen
2022-06-19 19:36 ` JamiKettunen
2022-06-20 16:40 ` [PR PATCH] [Updated] " JamiKettunen
2022-06-20 19:12 ` JamiKettunen
2022-06-22 15:36 ` JamiKettunen
2022-06-23 18:36 ` JamiKettunen
2022-06-24 21:13 ` JamiKettunen
2022-06-25 20:40 ` JamiKettunen

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).