diff options
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | PKGBUILD | 91 |
2 files changed, 65 insertions, 35 deletions
@@ -1,6 +1,6 @@ pkgbase = anbox-image-nocsd pkgdesc = Android image for running in Anbox, with no-csd patch and Houdini - pkgver = r9.368dafdb + pkgver = r12.4e93da62 pkgrel = 2 url = https://anbox.io arch = x86_64 @@ -14,9 +14,14 @@ pkgbase = anbox-image-nocsd makedepends = grep provides = anbox-image conflicts = anbox-image + noextract = fdroid-prev.apk + noextract = fdroid.apk + noextract = webview.apk source = android_amd64.img::https://github.com/thdaemon/anbox/releases/download/ssd-pr-v1/android.img source = houdini_y.sfs::https://github.com/redchenjs/aur-packages/releases/download/anbox-image/houdini_y.sfs source = houdini_z.sfs::https://github.com/redchenjs/aur-packages/releases/download/anbox-image/houdini_z.sfs + source = fdroid.apk::https://f-droid.org/repo/org.fdroid.fdroid_1014003.apk + source = fdroid-prev.apk::https://f-droid.org/repo/org.fdroid.fdroid.privileged_2120.apk source = media_codecs.xml source = media_codecs_google_video.xml source = media_codecs_google_audio.xml @@ -24,6 +29,8 @@ pkgbase = anbox-image-nocsd md5sums = 6c31bf493856f982da3d7d78b6e23b85 md5sums = 7ebf618b1af94a02322d9f2d2610090b md5sums = 5ca37e1629edb7d13b18751b72dc98ad + md5sums = 2b8799d8775e2d414e04635e1b90c4a7 + md5sums = dc7a163cc47fd2a2c441a266df06e69b md5sums = 360c6d7b14a538c8034b282b0371be9b md5sums = 2c96f31ead428ee2d1fbd2a65dd6962d md5sums = 9f0dd33e444d816ab62fe8e8514a0c0e @@ -4,7 +4,7 @@ # from: git pkgname=anbox-image-nocsd -pkgver=r9.368dafdb +pkgver=r12.4e93da62 pkgrel=2 pkgdesc="Android image for running in Anbox, with no-csd patch and Houdini" arch=('x86_64') @@ -14,29 +14,38 @@ makedepends=('curl' 'lzip' 'squashfs-tools' 'unzip' 'awk' 'findutils' 'grep') provides=('anbox-image') conflicts=('anbox-image') -_anbox_rel="$( - curl --config /dev/null -o /dev/null -Ls https://github.com/thdaemon/anbox/releases/latest -w '%{url_effective}\n' \ - | xargs basename -)" -#_bromite_release="$( +_img_rel=ssd-pr-v1 +# "$( +# curl --config /dev/null -o /dev/null -Ls https://github.com/thdaemon/anbox/releases/latest -w '%{url_effective}\n' \ +# | xargs basename +#)" +#_bromite_release=67.0.3396.88 +#"$( # curl --config /dev/null -o /dev/null -Ls https://github.com/bromite/bromite/releases/latest -w '%{url_effective}\n' \ # | xargs basename #)" -_bromite_release=54.0.2840.85 +_fdroidver=1014003 +_fdroidprivver=2120 + source=( - "android_amd64.img::https://github.com/thdaemon/anbox/releases/download/$_anbox_rel/android.img" + "android_amd64.img::https://github.com/thdaemon/anbox/releases/download/$_img_rel/android.img" +# "android_amd64.img::https://anbox.postmarketos.org/android-7.1.2_r39-anbox_x86_64-userdebug.img" "houdini_y.sfs::https://github.com/redchenjs/aur-packages/releases/download/anbox-image/houdini_y.sfs" "houdini_z.sfs::https://github.com/redchenjs/aur-packages/releases/download/anbox-image/houdini_z.sfs" - #"SystemWebview.apk::https://github.com/bromite/bromite/releases/download/$_bromite_release/x64_SystemWebView.apk" +# "webview.apk::https://github.com/bromite/bromite/releases/download/$_bromite_release/x86_SystemWebView.apk" + "fdroid.apk::https://f-droid.org/repo/org.fdroid.fdroid_$_fdroidver.apk" + "fdroid-prev.apk::https://f-droid.org/repo/org.fdroid.fdroid.privileged_$_fdroidprivver.apk" "media_codecs.xml" "media_codecs_google_video.xml" "media_codecs_google_audio.xml" "media_codecs_google_telephony.xml" ) -#noextract=('SystemWebview.apk') +noextract=('fdroid-prev.apk' 'fdroid.apk' 'webview.apk') md5sums=('6c31bf493856f982da3d7d78b6e23b85' '7ebf618b1af94a02322d9f2d2610090b' '5ca37e1629edb7d13b18751b72dc98ad' + '2b8799d8775e2d414e04635e1b90c4a7' + 'dc7a163cc47fd2a2c441a266df06e69b' '360c6d7b14a538c8034b282b0371be9b' '2c96f31ead428ee2d1fbd2a65dd6962d' '9f0dd33e444d816ab62fe8e8514a0c0e' @@ -47,8 +56,12 @@ pkgver () { _pkgver=$(( $(echo $pkgver|sed -En 's/r([[:digit:]]+)\..*/\1/p') + 1)) _sha=$(echo $pkgver|sed -En 's/r[[:digit:]]+\.(.*)/\1/p') __sha=$( - printf '%s\n%s\n' "$_anbox_rel" "$_bromite_release" | \ - sha256sum - | cut -c1-8 + printf '%s\n' \ + "$_img_rel" \ + "$_fdroidver" \ + "$_fdroidprivver" \ + "$_bromite_release" \ + | sha256sum - | cut -c1-8 ) if [ "$_sha" = "$__sha" ];then echo "$pkgver" @@ -60,37 +73,37 @@ pkgver () { build () { cd "$srcdir" - # unpack anbox image + msg2 "Unpack anbox image" mkdir -p squashfs-root rm -rf ./squashfs-root/* - unsquashfs -f -d ./squashfs-root ./android_amd64.img + unsquashfs -q -f -d ./squashfs-root ./android_amd64.img - # load houdini_y + msg2 "Unpack houdini_y" mkdir -p houdini_y rm -rf ./houdini_y/* - unsquashfs -f -d ./houdini_y ./houdini_y.sfs + unsquashfs -q -f -d ./houdini_y ./houdini_y.sfs mkdir -p ./squashfs-root/system/lib/arm cp -r ./houdini_y/* ./squashfs-root/system/lib/arm mv ./squashfs-root/system/lib/arm/libhoudini.so ./squashfs-root/system/lib/libhoudini.so - # load houdini_z + msg2 "Unpack houdini_z" mkdir -p houdini_z rm -rf ./houdini_z/* - unsquashfs -f -d ./houdini_z ./houdini_z.sfs + unsquashfs -q -f -d ./houdini_z ./houdini_z.sfs mkdir -p ./squashfs-root/system/lib64/arm64 cp -r ./houdini_z/* ./squashfs-root/system/lib64/arm64 mv ./squashfs-root/system/lib64/arm64/libhoudini.so ./squashfs-root/system/lib64/libhoudini.so - # add houdini parser + msg2 "Add houdini to binfmt_misc" mkdir -p ./squashfs-root/system/etc/binfmt_misc echo ':arm_exe:M::\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28::/system/lib/arm/houdini:P' >> ./squashfs-root/system/etc/binfmt_misc/arm_exe echo ':arm_dyn:M::\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\x28::/system/lib/arm/houdini:P' >> ./squashfs-root/system/etc/binfmt_misc/arm_dyn echo ':arm64_exe:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\xb7::/system/lib64/arm64/houdini64:P' >> ./squashfs-root/system/etc/binfmt_misc/arm64_exe echo ':arm64_dyn:M::\x7f\x45\x4c\x46\x02\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x03\x00\xb7::/system/lib64/arm64/houdini64:P' >> ./squashfs-root/system/etc/binfmt_misc/arm64_dyn - # add features + msg2 "Patch permissions" sed -i '/<\/permissions>/d' ./squashfs-root/system/etc/permissions/anbox.xml sed -i '/<unavailable-feature name=\"android.hardware.wifi\" \/>/d' ./squashfs-root/system/etc/permissions/anbox.xml sed -i '/<unavailable-feature name=\"android.hardware.bluetooth\" \/>/d' ./squashfs-root/system/etc/permissions/anbox.xml @@ -109,33 +122,43 @@ build () { <feature name="android.hardware.bluetooth" />' >> ./squashfs-root/system/etc/permissions/anbox.xml echo '</permissions>' >> ./squashfs-root/system/etc/permissions/anbox.xml - # set processors + msg2 "Enable processor support" sed -i '/^ro.product.cpu.abilist=x86_64,x86/ s/$/,arm64-v8a,armeabi-v7a,armeabi/' ./squashfs-root/system/build.prop sed -i '/^ro.product.cpu.abilist32=x86/ s/$/,armeabi-v7a,armeabi/' ./squashfs-root/system/build.prop sed -i '/^ro.product.cpu.abilist64=x86_64/ s/$/,arm64-v8a/' ./squashfs-root/system/build.prop - # enable nativebridge + msg2 "Enable nativebridge" echo 'persist.sys.nativebridge=1' >> ./squashfs-root/system/build.prop sed -i 's/ro.dalvik.vm.native.bridge=0/ro.dalvik.vm.native.bridge=libhoudini.so/' ./squashfs-root/default.prop - # enable opengles + msg2 "Enable opengles" echo 'ro.opengles.version=131072' >> ./squashfs-root/system/build.prop - # install media codecs + msg2 "Enable media codecs" cp media_codec*.xml ./squashfs-root/system/etc/ -# rm -rv ./squashfs-root/system/app/webview/* -# cp SystemWebview.apk ./squashfs-root/system/app/webview/webview.apk -# unzip -l SystemWebview.apk \ + + msg2 "Install fdroid" + mkdir -p \ + ./squashfs-root/system/app/FDroid \ + ./squashfs-root/system/priv-app/FDroid + cp -L fdroid.apk ./squashfs-root/system/app/FDroid/fdroid.apk + cp -L fdroid-prev.apk ./squashfs-root/system/priv-app/FDroid/fdroid.apk + chmod 0644 \ + ./squashfs-root/system/app/FDroid/fdroid.apk \ + ./squashfs-root/system/priv-app/FDroid/fdroid.apk + +# msg2 "Install bromite webview" +# rm -r ./squashfs-root/system/app/webview/* +# cp webview.apk ./squashfs-root/system/app/webview/webview.apk +# unzip -l webview.apk \ # | grep 'so$' \ # | awk '{print $4}' \ -# | xargs unzip -d ./squashfs-root/system/app/webview SystemWebview.apk +# | xargs unzip -qq -d ./squashfs-root/system/app/webview webview.apk + + msg2 "Pack android.img" + mksquashfs ./squashfs-root ./android.img -noappend -b 131072 -comp xz -Xbcj x86 -quiet } package() { - cd "$srcdir" - - # repack image - mksquashfs ./squashfs-root ./android.img -noappend -b 131072 -comp xz -Xbcj x86 - - install -Dm 644 ./android.img "$pkgdir/var/lib/anbox/android.img" + install -Dm 644 android.img "$pkgdir/var/lib/anbox/android.img" } |