forge/pmaports
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

main/anbox-image: upgrade to FDroid 1.11 and remove obsolete patch (MR 1972)

Browse source 
The patch can be removed as a proper fix has been found.
https://gitlab.com/postmarketOS/pmaports/-/merge_requests/1798 and
https://gitlab.com/postmarketOS/pmbootstrap/-/merge_requests/2005.

[ci:skip-build]: already built successfully in CI
This commit is contained in:
Antoine Fontaine 2021-02-21 18:52:07 +01:00 committed by Oliver Smith
parent cf743791e5
commit 94476a7482
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 4 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
main/anbox-image/APKBUILD
View file

@ -7,13 +7,13 @@
pkgname=anbox-image pkgname=anbox-image
pkgver=7.1.2_p39 pkgver=7.1.2_p39
_pkgver="${pkgver/p/r}" _pkgver="${pkgver/p/r}"
pkgrel=3 pkgrel=4
pkgdesc="Android image for running in Anbox" pkgdesc="Android image for running in Anbox"
url="https://anbox.io" url="https://anbox.io"
arch="x86_64 armv7 aarch64" arch="x86_64 armv7 aarch64"
makedepends="squashfs-tools" makedepends="squashfs-tools"
license="GPL-3.0-only" license="GPL-3.0-only"
_fdroidver=1007051 _fdroidver=1011050
_fdroid="org.fdroid.fdroid_$_fdroidver.apk" _fdroid="org.fdroid.fdroid_$_fdroidver.apk"
_fdroidprivver=2110 _fdroidprivver=2110
_fdroidpriv="org.fdroid.fdroid.privileged_$_fdroidprivver.apk" _fdroidpriv="org.fdroid.fdroid.privileged_$_fdroidprivver.apk"
@ -23,7 +23,6 @@ source="
http://anbox.postmarketos.org/android-$_pkgver.1-anbox_armv7a_neon-userdebug.img http://anbox.postmarketos.org/android-$_pkgver.1-anbox_armv7a_neon-userdebug.img
https://f-droid.org/repo/$_fdroid https://f-droid.org/repo/$_fdroid
https://f-droid.org/repo/$_fdroidpriv https://f-droid.org/repo/$_fdroidpriv
pma#480.patch
" "
builddir="$srcdir/squashfs" builddir="$srcdir/squashfs"
options="!check !archcheck !tracedeps pmb:cross-native" options="!check !archcheck !tracedeps pmb:cross-native"
@ -71,6 +70,5 @@ package() {
sha512sums="174476153fc5f0f204a8044f32d010e7a22303c7961265976df424c53322969b590d58716a57a2f6b508a90ad645f9bede85e94b85a18790b40cc9b843c66adc android-7.1.2_r39-anbox_x86_64-userdebug.img sha512sums="174476153fc5f0f204a8044f32d010e7a22303c7961265976df424c53322969b590d58716a57a2f6b508a90ad645f9bede85e94b85a18790b40cc9b843c66adc android-7.1.2_r39-anbox_x86_64-userdebug.img
240d931c68378f80eafa670a19083c5dd11c02f216bec5de955bee3a04063c15830b603a062c83427aa7ad6f4da5425f411147f93815fa67c86cdc850b68a2a1 android-7.1.2_r39-anbox_arm64-userdebug.img 240d931c68378f80eafa670a19083c5dd11c02f216bec5de955bee3a04063c15830b603a062c83427aa7ad6f4da5425f411147f93815fa67c86cdc850b68a2a1 android-7.1.2_r39-anbox_arm64-userdebug.img
c0de307cdea7ddc19d5990998cb3f59dac59912a08dacb0d92be09c31bf8f2312d1e02fa8321b950151995120fa9401052b8e97dde620c1739a8314a4470e47d android-7.1.2_r39.1-anbox_armv7a_neon-userdebug.img c0de307cdea7ddc19d5990998cb3f59dac59912a08dacb0d92be09c31bf8f2312d1e02fa8321b950151995120fa9401052b8e97dde620c1739a8314a4470e47d android-7.1.2_r39.1-anbox_armv7a_neon-userdebug.img
1b5be16578a86cf5a65591b0c923f791587699b79a50986e68ac290e20e0d252fe57db5a49a0628eb6c66542a6caea76bd382018447fd5ae4d13b54f12b908a7 org.fdroid.fdroid_1007051.apk b7ff6a78470f95e9019b004d66bf84cd38987072a2fdb24e2a770f9fadc9c60131c84378882f45a7194596f1d4708e587477d5409ae30e50b4554bbb72b19335 org.fdroid.fdroid_1011050.apk
3c34eb04c96ebee2a1baa06bcf4ebf16915a1fd69143502639998caf34beb744458823705a65617c3bc4e134e5c9fc7fbca4196e1430d7b4d701748fbc29b9dc org.fdroid.fdroid.privileged_2110.apk 3c34eb04c96ebee2a1baa06bcf4ebf16915a1fd69143502639998caf34beb744458823705a65617c3bc4e134e5c9fc7fbca4196e1430d7b4d701748fbc29b9dc org.fdroid.fdroid.privileged_2110.apk"
17926716e13368e5dfc1e46724b1addf7a69b0fa4abd0557333882ef0235d93883e99d33a652806b5c296a00e4391faa3d862fcb5c7a5513e0b2a781c5053968 pma#480.patch"

14
main/anbox-image/pma#480.patch
View file

@ -1,14 +0,0 @@
--- a/anbox-init.sh
+++ b/anbox-init.sh
@@ -36,5 +36,11 @@ prepare_filesystem &
echo "Waiting for filesystem being prepared ..."
wait $!
+(
+while ip route add default via 192.168.250.1; do
+ sleep 1
+done
+) >/dev/null 2>&1 &
+
echo "Starting real init now ..."
exec /init