Github messages for voidlinux
 help / color / mirror / Atom feed
From: JamiKettunen <JamiKettunen@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: waydroid-1.2.1
Date: Sat, 25 Jun 2022 22:40:47 +0200	[thread overview]
Message-ID: <20220625204047.Kddx24k7WWfZ_4Y6MzZUeNy1iQSPPzxzZywPCIgX-o0@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-37611@inbox.vuxu.org>

[-- 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
+}

  parent reply	other threads:[~2022-06-25 20:40 UTC|newest]

Thread overview: 54+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-19  0:51 [PR PATCH] " 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 message]
2022-07-04 22:28 ` JamiKettunen
2022-07-07  0:04 ` JamiKettunen
2022-07-14  0:36 ` JamiKettunen
2022-07-19 15:00 ` JamiKettunen
2022-07-21 12:48 ` JamiKettunen
2022-07-24 14:23 ` sgn
2022-07-24 15:25 ` [PR PATCH] [Updated] " JamiKettunen
2022-07-29 16:43 ` sgn
2022-07-29 18:21 ` JamiKettunen
2022-07-29 18:26 ` [PR PATCH] [Updated] " JamiKettunen
2022-07-29 18:41 ` CameronNemo
2022-07-30  0:15 ` sgn
2022-07-30  0:34 ` sgn
2022-08-09 10:58 ` JamiKettunen
2022-08-09 10:59 ` JamiKettunen
2022-08-09 11:01 ` JamiKettunen
2022-08-09 11:01 ` sgn
2022-08-09 11:18 ` JamiKettunen
2022-08-09 11:35 ` JamiKettunen
2022-08-09 14:08 ` sgn
2022-08-09 15:20 ` JamiKettunen
2022-08-09 15:23 ` JamiKettunen
2022-08-09 15:32 ` sgn
2022-08-09 22:12 ` JamiKettunen
2022-08-09 22:21 ` JamiKettunen
2022-08-09 22:22 ` JamiKettunen
2022-08-09 22:23 ` JamiKettunen
2022-08-09 23:17 ` CameronNemo
2022-08-10  0:18 ` sgn
2022-08-10 12:02 ` JamiKettunen
2022-08-11  2:34 ` CameronNemo
2022-08-12 19:31 ` [PR PATCH] [Updated] " JamiKettunen
2022-08-12 22:00 ` JamiKettunen
2022-08-13 18:11 ` New package: waydroid-1.3.0 jcgruenhage
2022-08-13 18:19 ` JamiKettunen
2022-08-13 18:46 ` jcgruenhage
2022-08-13 19:08 ` JamiKettunen
2022-08-21 10:36 ` JamiKettunen
2022-08-21 11:12 ` [PR PATCH] [Merged]: " sgn

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220625204047.Kddx24k7WWfZ_4Y6MzZUeNy1iQSPPzxzZywPCIgX-o0@z \
    --to=jamikettunen@users.noreply.github.com \
    --cc=ml@inbox.vuxu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).