From: Johnnynator <Johnnynator@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] New package: waydroid
Date: Sun, 26 Sep 2021 18:21:44 +0200 [thread overview]
Message-ID: <20210926162144.L-4U18rR_EmrP45xkt9mUisoTd2aNP7dAgGjMzgr59Q@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-33135@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 1964 bytes --]
There is an updated pull request by Johnnynator against master on the void-packages repository
https://github.com/Johnnynator/void-packages waydroid
https://github.com/void-linux/void-packages/pull/33135
New package: waydroid
- New package: libglibutil-1.0.55
- New package: libgbinder-1.1.11
- New package: waydroid-0.0.0.13092021
- New package: waydroid-image-17.1.20210913
- New package: gbinder-python-0.0.0.20210812
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [ ] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
Quick notes for testing:
- install waydroid
- `sudo waydroid init -f`
- `sudo waydroid container start`
- `waydroid session start`
- `waydroid show-full-ui`
A patch file from https://github.com/void-linux/void-packages/pull/33135.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-waydroid-33135.patch --]
[-- Type: text/x-diff, Size: 19418 bytes --]
From 99c8479d224935f8e8af8c2ea33205b0fa1229c7 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Thu, 23 Sep 2021 11:35:07 +0200
Subject: [PATCH 1/7] New package: libglibutil-1.0.55
---
common/shlibs | 1 +
srcpkgs/libglibutil-devel | 1 +
srcpkgs/libglibutil/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/libglibutil-devel
create mode 100644 srcpkgs/libglibutil/template
diff --git a/common/shlibs b/common/shlibs
index 2dbe14a7c6e6..571a963eed08 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -108,6 +108,7 @@ libturbojpeg.so.0 libjpeg-turbo-1.3.0_2
libpng16.so.16 libpng-1.6.2_1
libXrender.so.1 libXrender-0.9.4_1
libXrandr.so.2 libXrandr-1.3.0_1
+libglibutil.so.1 libglibutil-1.0.35_1
libGLU.so.1 glu-9.0.0_1
libGL.so.1 libGL-7.11_1
libEGL.so.1 libEGL-7.11_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..c044b4545bd3
--- /dev/null
+++ b/srcpkgs/libglibutil/template
@@ -0,0 +1,27 @@
+# Template file for 'libglibutil'
+pkgname=libglibutil
+version=1.0.55
+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"
+hostmakedepends="pkg-config"
+makedepends="glib-devel"
+short_desc="Library of glib utilities"
+maintainer="John <me@johnnynator.dev>"
+license="BSD-3-Clause"
+homepage="glib-devel"
+distfiles="https://git.sailfishos.org/mer-core/libglibutil/-/archive/$version/libglibutil-$version.tar.gz"
+checksum=56b5319f3eac04c19d0a7d361b1a6810817ad863b2e758de61a8068cad92141a
+
+libglibutil-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision}"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From eff6661da793b26873b7b6353052cc827a509945 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:37 +0200
Subject: [PATCH 2/7] New package: libgbinder-1.1.11
---
common/shlibs | 1 +
srcpkgs/libgbinder-devel | 1 +
srcpkgs/libgbinder/template | 27 +++++++++++++++++++++++++++
3 files changed, 29 insertions(+)
create mode 120000 srcpkgs/libgbinder-devel
create mode 100644 srcpkgs/libgbinder/template
diff --git a/common/shlibs b/common/shlibs
index 571a963eed08..67eb1e25e6c7 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -109,6 +109,7 @@ libpng16.so.16 libpng-1.6.2_1
libXrender.so.1 libXrender-0.9.4_1
libXrandr.so.2 libXrandr-1.3.0_1
libglibutil.so.1 libglibutil-1.0.35_1
+libgbinder.so.1 libgbinder-1.1.11_1
libGLU.so.1 glu-9.0.0_1
libGL.so.1 libGL-7.11_1
libEGL.so.1 libEGL-7.11_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..961dfcabb1c6
--- /dev/null
+++ b/srcpkgs/libgbinder/template
@@ -0,0 +1,27 @@
+# Template file for 'libgbinder'
+pkgname=libgbinder
+version=1.1.11
+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"
+hostmakedepends="pkg-config"
+makedepends="glib-devel libglibutil-devel"
+short_desc="GLib-style interface to binder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/mer-hybris/libgbinder"
+distfiles="https://github.com/mer-hybris/libgbinder/archive/${version}/libgbinder-${version}.tar.gz"
+checksum=cc7c08d09667c1b54f6e04d7e358aabdb86b40fbb86cb3f514d425474acf7f5a
+
+libgbinder-devel_package() {
+ depends="${sourcepkg}>=${version}_${revision} glib-devel libglibutil-devel"
+ short_desc+=" - development files"
+ pkg_install() {
+ vmove usr/include
+ vmove usr/lib/pkgconfig
+ vmove "usr/lib/*.so"
+ }
+}
From f1aeabd98be6d9679bfb5f7fa8061ff0bf29325d Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:54 +0200
Subject: [PATCH 3/7] New package: waydroid-0.0.0.13092021
---
srcpkgs/waydroid/files/gbinder.conf | 2 ++
srcpkgs/waydroid/files/waydroid-container/run | 3 ++
.../waydroid/files/waydroid-session.desktop | 8 +++++
srcpkgs/waydroid/template | 29 +++++++++++++++++++
4 files changed, 42 insertions(+)
create mode 100644 srcpkgs/waydroid/files/gbinder.conf
create mode 100755 srcpkgs/waydroid/files/waydroid-container/run
create mode 100644 srcpkgs/waydroid/files/waydroid-session.desktop
create mode 100644 srcpkgs/waydroid/template
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/run b/srcpkgs/waydroid/files/waydroid-container/run
new file mode 100755
index 000000000000..0bcc4f53a6f1
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-container/run
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+exec /usr/bin/waydroid container start
diff --git a/srcpkgs/waydroid/files/waydroid-session.desktop b/srcpkgs/waydroid/files/waydroid-session.desktop
new file mode 100644
index 000000000000..534bd59b2482
--- /dev/null
+++ b/srcpkgs/waydroid/files/waydroid-session.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Version=1.0
+Name=Waydroid Session
+Comment=Starts the Waydroid session
+Exec=/usr/bin/waydroid session start
+TryExec=/usr/bin/waydroid
+Terminal=false
+Type=Application
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
new file mode 100644
index 000000000000..6bd7433b0e3d
--- /dev/null
+++ b/srcpkgs/waydroid/template
@@ -0,0 +1,29 @@
+# Template file for 'waydroid'
+pkgname=waydroid
+version=0.0.0.20210924
+revision=1
+_commit=e990576ec954ab53cdac5e534f5897d5f3ed0996
+wrksrc="waydroid-$_commit"
+depends="waydroid-image gbinder-python lxc python3-gobject"
+short_desc="Container-based approach to boot a full Android system"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-or-later"
+homepage="https://waydro.id"
+distfiles="https://github.com/waydroid/waydroid/archive/${_commit}.tar.gz"
+checksum=ca0cc055aed6925e0d22a8a1ce5bca31c89b96398be3d82f5f517c5526b4a5a8
+pycompile_dirs="/usr/lib/waydroid"
+
+do_install() {
+ vmkdir usr/lib/waydroid
+ vmkdir usr/bin
+
+ vcopy tools usr/lib/waydroid
+ vcopy data usr/lib/waydroid
+ vinstall waydroid.py 755 usr/lib/waydroid
+ ln -sr $DESTDIR/usr/lib/waydroid/waydroid.py ${DESTDIR}/usr/bin/waydroid
+
+ vinstall $FILESDIR/gbinder.conf 644 etc
+ vinstall $FILESDIR/waydroid-session.desktop 644 etc/xdg/autostart
+
+ vsv waydroid-container
+}
From 9f533eb07e85de5d312fe199ecace276485ae98a Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:37:59 +0200
Subject: [PATCH 4/7] New package: waydroid-image-17.1.20210913
---
srcpkgs/waydroid-image/template | 51 +++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
create mode 100644 srcpkgs/waydroid-image/template
diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
new file mode 100644
index 000000000000..5c6091edd72e
--- /dev/null
+++ b/srcpkgs/waydroid-image/template
@@ -0,0 +1,51 @@
+# Template file for 'waydroid-image'
+pkgname=waydroid-image
+version=17.1.20210913
+_pkgver="17.1-20210913"
+_pkgver_images_vendor="17.1-20210907"
+revision=1
+archs="arm* aarch64* x86_64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
+ 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
+ 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
+ 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
+ fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
+ 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
+ dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
+ 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
+
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*) _imgarch="arm64" ;;
+ arm*) _imgarch="arm" ;;
+ *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+ # Overwriting as it's easier to install directly while unzipping and we
+ # don't need other arches than the native unpacked
+ :
+}
+
+do_install() {
+ vmkdir usr/share/waydroid-extra/images
+
+ unzip -n \
+ -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+ -d "$DESTDIR"/usr/share/waydroid-extra/images
+ unzip -n \
+ -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+ -d "$DESTDIR"/usr/share/waydroid-extra/images
+}
From fc74891e5c6f286299fba088f683c25eabe666d0 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sat, 25 Sep 2021 12:38:55 +0200
Subject: [PATCH 5/7] New package: gbinder-python-0.0.0.20210812
---
srcpkgs/gbinder-python/template | 16 ++++++++++++++++
1 file changed, 16 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..df029da2bc55
--- /dev/null
+++ b/srcpkgs/gbinder-python/template
@@ -0,0 +1,16 @@
+# Template file for 'gbinder-python'
+pkgname=gbinder-python
+version=0.0.0.20210812
+revision=1
+_commit=2e1e05c0a0240d6c06e9bbe9b22dcc35c2e0211c
+wrksrc="gbinder-python-$_commit"
+build_style=python3-module
+make_build_args="--cython"
+hostmakedepends="python3-setuptools python3-Cython pkg-config"
+makedepends="libgbinder-devel python3-devel"
+short_desc="Python bindings for libgbinder"
+maintainer="John <me@johnnynator.dev>"
+license="GPL-3.0-only"
+homepage="https://github.com/erfanoabdi/gbinder-python"
+distfiles="https://github.com/erfanoabdi/gbinder-python/archive/$_commit.tar.gz"
+checksum=7717d3ec530bf53ef8eb6b49320cd46341f00f517b0cbc34c922c1f83cba5bd9
From f8a9492fac81e6e4ed20a26f5becf0007e0ebccb Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sun, 26 Sep 2021 18:21:16 +0200
Subject: [PATCH 6/7] New package: waydroid-image-aarch64-17.1.20210926
---
srcpkgs/waydroid-image-aarch64/template | 47 +++++++++++++++++++++++++
1 file changed, 47 insertions(+)
create mode 100644 srcpkgs/waydroid-image-aarch64/template
diff --git a/srcpkgs/waydroid-image-aarch64/template b/srcpkgs/waydroid-image-aarch64/template
new file mode 100644
index 000000000000..2c9943b46b03
--- /dev/null
+++ b/srcpkgs/waydroid-image-aarch64/template
@@ -0,0 +1,47 @@
+# Template file for 'waydroid-image-aarch64'
+pkgname=waydroid-image-aarch64
+version=17.1.20210926
+_pkgver="17.1-20210926"
+_pkgver_images_vendor="17.1-20210925"
+revision=1
+archs="aarch64*"
+hostmakedepends="unzip"
+short_desc="Android containers for use in Waydroid"
+maintainer="John <me@johnnynator.dev>"
+license="Apache-2.0"
+homepage="https://waydro.id"
+distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip"
+checksum="2a1c622e0ee2c37193a2f3a752747727fa9d55286df26170a3121f7288bb49b0
+ 93c92e258bc7d04b2e84261fa2cca4fcbf4b2f7c7d82bf3e9f652a08e8c2d060"
+distfiles_arm="
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
+distfiles_x86="
+https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
+ https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
+"
+case "$XBPS_TARGET_MACHINE" in
+ aarch64*) _imgarch="arm64" ;;
+ arm*) _imgarch="arm" ;;
+ *) _imgarch="$MACHINE" ;;
+esac
+
+do_extract() {
+ # Overwriting as it's easier to install directly while unzipping and we
+ # don't need other arches than the native unpacked
+ :
+}
+
+do_install() {
+ vmkdir usr/share/waydroid-extra/images
+
+ unzip -n \
+ -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
+ -d "$DESTDIR"/usr/share/waydroid-extra/images
+ unzip -n \
+ -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
+ -d "$DESTDIR"/usr/share/waydroid-extra/images
+}
From bb9c6d7284550955094b582a975c20b6d7845936 Mon Sep 17 00:00:00 2001
From: John Zimmermann <me@johnnynator.dev>
Date: Sun, 26 Sep 2021 18:21:23 +0200
Subject: [PATCH 7/7] fixup! New package: waydroid-0.0.0.13092021
---
srcpkgs/waydroid-image/template | 51 ---------------------------------
srcpkgs/waydroid/template | 7 ++++-
2 files changed, 6 insertions(+), 52 deletions(-)
delete mode 100644 srcpkgs/waydroid-image/template
diff --git a/srcpkgs/waydroid-image/template b/srcpkgs/waydroid-image/template
deleted file mode 100644
index 5c6091edd72e..000000000000
--- a/srcpkgs/waydroid-image/template
+++ /dev/null
@@ -1,51 +0,0 @@
-# Template file for 'waydroid-image'
-pkgname=waydroid-image
-version=17.1.20210913
-_pkgver="17.1-20210913"
-_pkgver_images_vendor="17.1-20210907"
-revision=1
-archs="arm* aarch64* x86_64*"
-hostmakedepends="unzip"
-short_desc="Android containers for use in Waydroid"
-maintainer="John <me@johnnynator.dev>"
-license="Apache-2.0"
-homepage="https://waydro.id"
-distfiles="https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86_64/lineage-$_pkgver-VANILLA-waydroid_x86_64-system.zip
- https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm64/lineage-$_pkgver-VANILLA-waydroid_arm64-system.zip
- https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_x86/lineage-$_pkgver-VANILLA-waydroid_x86-system.zip
- https://sourceforge.net/projects/waydroid/files/images/system/lineage/waydroid_arm/lineage-$_pkgver-VANILLA-waydroid_arm-system.zip
- https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm64-vendor.zip
- https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86_64/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86_64-vendor.zip
- https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_x86/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_x86-vendor.zip
- https://sourceforge.net/projects/waydroid/files/images/vendor/waydroid_arm/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_arm-vendor.zip"
-checksum="dadd9fbaae82666bfaca37df9f7bda13e4c5c67277de61c23081291e2604f004
- 0bc1549837ee949a945859ff188af503dd76d9122caf1aaf9e25100fb1ddef4b
- 3cc7869b3579aee93a5d0055cd50c386ecb02347a00add34eb317c57fbfa141e
- 736c4417c48e329f1ae44841c0b6a1e097c7ea10c03860ff0275ec13aae8bb09
- fa2ddd2eaebde380f105050f2d3f6f2c71da65ce611a55b3257057140d968fed
- 2cfac1159d60ca2ddc74349e2f2ace1323ee355cd09ced580b11a78534e4480d
- dfd85a9a9d1a3655c04d929ddb1236f6ab9f121d900ec30c3402b6e96ecd76fb
- 5eb104a4ee944d533cd393bb25d1efc2a4e85cb1b0f9a50278df80d5a396af7a"
-
-case "$XBPS_TARGET_MACHINE" in
- aarch64*) _imgarch="arm64" ;;
- arm*) _imgarch="arm" ;;
- *) _imgarch="$MACHINE" ;;
-esac
-
-do_extract() {
- # Overwriting as it's easier to install directly while unzipping and we
- # don't need other arches than the native unpacked
- :
-}
-
-do_install() {
- vmkdir usr/share/waydroid-extra/images
-
- unzip -n \
- -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver-VANILLA-waydroid_$_imgarch-system.zip \
- -d "$DESTDIR"/usr/share/waydroid-extra/images
- unzip -n \
- -q ${XBPS_SRCDISTDIR}/${pkgname}-${version}/lineage-$_pkgver_images_vendor-MAINLINE-waydroid_$_imgarch-vendor.zip \
- -d "$DESTDIR"/usr/share/waydroid-extra/images
-}
diff --git a/srcpkgs/waydroid/template b/srcpkgs/waydroid/template
index 6bd7433b0e3d..6c879a6014f4 100644
--- a/srcpkgs/waydroid/template
+++ b/srcpkgs/waydroid/template
@@ -4,7 +4,7 @@ version=0.0.0.20210924
revision=1
_commit=e990576ec954ab53cdac5e534f5897d5f3ed0996
wrksrc="waydroid-$_commit"
-depends="waydroid-image gbinder-python lxc python3-gobject"
+depends="gbinder-python lxc python3-gobject"
short_desc="Container-based approach to boot a full Android system"
maintainer="John <me@johnnynator.dev>"
license="GPL-3.0-or-later"
@@ -12,6 +12,11 @@ homepage="https://waydro.id"
distfiles="https://github.com/waydroid/waydroid/archive/${_commit}.tar.gz"
checksum=ca0cc055aed6925e0d22a8a1ce5bca31c89b96398be3d82f5f517c5526b4a5a8
pycompile_dirs="/usr/lib/waydroid"
+python_version=3
+
+case "$XBPS_TARGET_ARCH" in
+ aarch64*) depends+=" waydroid-image-aarch64";;
+esac
do_install() {
vmkdir usr/lib/waydroid
next prev parent reply other threads:[~2021-09-26 16:21 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-26 15:25 [PR PATCH] " Johnnynator
2021-09-26 15:34 ` [PR PATCH] [Updated] " Johnnynator
2021-09-26 16:21 ` Johnnynator [this message]
2021-09-26 16:55 ` Anachron
2021-09-26 17:36 ` Johnnynator
2021-09-28 13:09 ` [PR PATCH] [Updated] " Johnnynator
2021-09-28 17:35 ` q66
2022-01-23 1:15 ` notthewave
2022-01-23 1:16 ` [PR REVIEW] " notthewave
2022-01-30 13:12 ` Johnnynator
2022-01-30 13:12 ` Johnnynator
2022-01-30 16:21 ` [PR PATCH] [Updated] " Johnnynator
2022-03-07 18:07 ` Relected
2022-03-07 21:11 ` Johnnynator
2022-06-06 2:15 ` github-actions
2022-06-19 8:19 ` [PR PATCH] [Closed]: " Johnnynator
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=20210926162144.L-4U18rR_EmrP45xkt9mUisoTd2aNP7dAgGjMzgr59Q@z \
--to=johnnynator@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).