From ca0d788edd1ef64cc0c2b607a3571b57db05ca28 Mon Sep 17 00:00:00 2001 From: Antoine Fontaine Date: Wed, 11 Mar 2020 12:58:23 +0100 Subject: [PATCH] main/anbox-image: drop input patch (!1054) It is no longer necessary, as input patch has been backported https://gitlab.alpinelinux.org/alpine/aports/merge_requests/5277 --- main/anbox-image/APKBUILD | 6 ++---- main/anbox-image/dev-input.patch | 17 ----------------- 2 files changed, 2 insertions(+), 21 deletions(-) delete mode 100644 main/anbox-image/dev-input.patch diff --git a/main/anbox-image/APKBUILD b/main/anbox-image/APKBUILD index 4cb5a31c3..5c6d994c9 100644 --- a/main/anbox-image/APKBUILD +++ b/main/anbox-image/APKBUILD @@ -9,7 +9,7 @@ pkgname=anbox-image pkgver="7.1.2_p39" _pkgver="${pkgver/p/r}" -pkgrel=0 +pkgrel=1 pkgdesc="Android image for running in Anbox" url="https://anbox.io" arch="x86_64 armv7 aarch64" @@ -25,7 +25,6 @@ source=" http://anbox.postmarketos.org/android-$_pkgver-anbox_armv7a_neon-userdebug.img https://f-droid.org/repo/$_fdroid https://f-droid.org/repo/$_fdroidpriv - dev-input.patch " builddir="$srcdir/squashfs" options="!check" @@ -72,5 +71,4 @@ sha512sums="174476153fc5f0f204a8044f32d010e7a22303c7961265976df424c53322969b590d 240d931c68378f80eafa670a19083c5dd11c02f216bec5de955bee3a04063c15830b603a062c83427aa7ad6f4da5425f411147f93815fa67c86cdc850b68a2a1 android-7.1.2_r39-anbox_arm64-userdebug.img 53d960894111b19504c903a549130d68b3edecd88800b40c3b0a0473ed44f752b514b78b34e6732086f6226d6e072c5228541374a9ffba3cab42d3c6dd9b0ce6 android-7.1.2_r39-anbox_armv7a_neon-userdebug.img 1b5be16578a86cf5a65591b0c923f791587699b79a50986e68ac290e20e0d252fe57db5a49a0628eb6c66542a6caea76bd382018447fd5ae4d13b54f12b908a7 org.fdroid.fdroid_1007051.apk -3c34eb04c96ebee2a1baa06bcf4ebf16915a1fd69143502639998caf34beb744458823705a65617c3bc4e134e5c9fc7fbca4196e1430d7b4d701748fbc29b9dc org.fdroid.fdroid.privileged_2110.apk -d9877b59704f5c5b02a8f8daed9f6dcfd07ffe625ac38cbee41247484d2040ab1648c6229d7fe674faba93e58786330bfc9f5f019a6263279b79d4d442ea0aca dev-input.patch" +3c34eb04c96ebee2a1baa06bcf4ebf16915a1fd69143502639998caf34beb744458823705a65617c3bc4e134e5c9fc7fbca4196e1430d7b4d701748fbc29b9dc org.fdroid.fdroid.privileged_2110.apk" diff --git a/main/anbox-image/dev-input.patch b/main/anbox-image/dev-input.patch deleted file mode 100644 index 9fa89b4b8..000000000 --- a/main/anbox-image/dev-input.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/anbox-init.sh -+++ b/anbox-init.sh -@@ -18,12 +18,12 @@ set -x - function prepare_filesystem() { - # These dev files need to be adjusted everytime as they are - # bind mounted into the temporary rootfs -- for f in qemu_pipe qemu_trace goldfish_pipe input/* ; do -+ for f in qemu_pipe qemu_trace goldfish_pipe input input/* ; do - if [ ! -e "/dev/$f" ] ; then - continue - fi - chown system:system /dev/$f -- chmod 0666 /dev/$f -+ chmod 0777 /dev/$f - done - - if [ -e "/dev/tun" ] ; then