From 58763270a9d04c47c9600906e0ca0c2c20209036 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Fri, 17 Jun 2022 19:39:42 +0800 Subject: [PATCH 1/3] Calculate product size dynamically --- .github/workflows/magisk.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/magisk.yml b/.github/workflows/magisk.yml index 2cc7bd0..6632ff6 100644 --- a/.github/workflows/magisk.yml +++ b/.github/workflows/magisk.yml @@ -269,12 +269,16 @@ jobs: unzip -p gapps.zip {Core,GApps}/'*.lz' | tar --lzip -C gapps -xvf - -i --strip-components=2 --exclude='setupwizardtablet-x86_64' --exclude='packageinstallergoogle-all' --exclude='speech-common' --exclude='markup-lib-arm' --exclude='markup-lib-arm64' --exclude='markup-all' --exclude='setupwizarddefault-x86_64' --exclude='pixellauncher-all' --exclude='pixellauncher-common' # TODO: calculate the size dynamically for better compatibility - e2fsck -yf ${{ matrix.arch }}/product.img - resize2fs ${{ matrix.arch }}/product.img 1024M e2fsck -yf ${{ matrix.arch }}/system_ext.img resize2fs ${{ matrix.arch }}/system_ext.img 200M - name: Expand vendor and system run: | + e2fsck -yf ${{ matrix.arch }}/product.img + product_size=$(( $(du -sB512 ${{ matrix.arch }}/product.img | cut -f1) + 20000 )) + if [ -d gapps/product ]; then + product_size=$(( $product_size + $(du -sB512 gapps/product | cut -f1) )) + fi + resize2fs ${{ matrix.arch }}/product.img "$product_size"s e2fsck -yf ${{ matrix.arch }}/system.img system_size=$(( $(du -sB512 ${{ matrix.arch }}/system.img | cut -f1) + 20000 )) if [ -d gapps ]; then From aac17b44306852301b03c22e5eab9df8429edb23 Mon Sep 17 00:00:00 2001 From: Howard Wu <40033067+Howard20181@users.noreply.github.com> Date: Fri, 17 Jun 2022 19:55:08 +0800 Subject: [PATCH 2/3] 1 --- .github/workflows/magisk.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/magisk.yml b/.github/workflows/magisk.yml index 6632ff6..1fce3c1 100644 --- a/.github/workflows/magisk.yml +++ b/.github/workflows/magisk.yml @@ -282,7 +282,7 @@ jobs: e2fsck -yf ${{ matrix.arch }}/system.img system_size=$(( $(du -sB512 ${{ matrix.arch }}/system.img | cut -f1) + 20000 )) if [ -d gapps ]; then - system_size=$(( $system_size + $(du -sB512 gapps | cut -f1) )) + system_size=$(( $system_size + $(du -sB512 gapps | cut -f1) - $(du -sB512 gapps/product | cut -f1) )) fi if [ -d magisk ]; then system_size=$(( $system_size +$(du -sB512 magisk | cut -f1) )) From a9bb8433af36735c5b85cbd0c1c85461611917f4 Mon Sep 17 00:00:00 2001 From: Syuugo Date: Fri, 17 Jun 2022 21:24:11 +0900 Subject: [PATCH 3/3] Added flow to remove Amazon AppStore (#420) --- .github/workflows/magisk.yml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/.github/workflows/magisk.yml b/.github/workflows/magisk.yml index 1fce3c1..7ebf5a5 100644 --- a/.github/workflows/magisk.yml +++ b/.github/workflows/magisk.yml @@ -47,6 +47,14 @@ on: - pico - tvstock - tvmini + remove_amazon: + description: "Remove Amazon AppStore" + required: true + default: "keep" + type: choice + options: + - keep + - remove root_sol: description: "Root solution" required: true @@ -300,6 +308,10 @@ jobs: sudo mount -o loop ${{ matrix.arch }}/vendor.img system/vendor sudo mount -o loop ${{ matrix.arch }}/product.img system/product sudo mount -o loop ${{ matrix.arch }}/system_ext.img system/system_ext + - name: Remove Amazon AppStore + if: ${{ github.event.inputs.remove_amazon == 'remove' }} + run: | + find system/product/{etc/permissions,etc/sysconfig,framework,priv-app} | grep -e amazon -e venezia | sudo xargs rm -rf - name: Integrate Magisk if: ${{ github.event.inputs.root_sol == 'magisk' || github.event.inputs.root_sol == '' }} run: | @@ -431,7 +443,7 @@ jobs: sudo find system/system/{app,framework,priv-app} -type f -exec chcon --reference=system/system/framework/ext.jar {} \; ls gapps/etc/ | xargs -n 1 -I dir sudo find system/system/etc/dir -type f -exec chcon --reference=system/system/etc/permissions {} \; - sudo find system/product/{app,etc,overlay,priv-app} -type f -exec chcon --reference=system/product/etc/permissions/privapp-permissions-venezia.xml {} \; + sudo find system/product/{app,etc,overlay,priv-app} -type f -exec chcon --reference=system/product/etc/permissions/com.android.settings.intelligence.xml {} \; sudo patchelf --replace-needed libc.so "${HOME}/libc.so" ./magiskpolicy || true sudo patchelf --replace-needed libm.so "${HOME}/libm.so" ./magiskpolicy || true sudo patchelf --replace-needed libdl.so "${HOME}/libdl.so" ./magiskpolicy || true @@ -516,6 +528,7 @@ jobs: fix_prop(sec, prop) - name: Umount images run: | + sudo find system -exec touch -amt 200901010000.00 {} \;> /dev/null 2>&1 sudo umount system/vendor sudo umount system/product sudo umount system/system_ext