From 2e6812c5864414accf29ee8ddd2ba1453d71b2bb Mon Sep 17 00:00:00 2001 From: matt1432 Date: Mon, 3 Oct 2022 20:58:50 -0400 Subject: [PATCH] Update, mostly for before.sh --- before.sh | 17 +++++++++++++++-- docker-compose.yml | 2 +- magiskScripts/dos2unix | 2 ++ magiskScripts/getprop | 2 ++ magiskScripts/magisk.sh | 8 ++++++++ magiskScripts/root-img.sh | 15 +++++++++++++++ 6 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 magiskScripts/dos2unix create mode 100644 magiskScripts/getprop create mode 100644 magiskScripts/root-img.sh diff --git a/before.sh b/before.sh index 54c5d65..7a98edb 100755 --- a/before.sh +++ b/before.sh @@ -8,7 +8,20 @@ sed -i 's/overrides.*/overrides: ["Home", "Launcher2", "Launcher3", "Launcher3Qu ## remove F-Droid echo "PRODUCT_PACKAGES += \\ + GmsCore \\ + GsfProxy \\ + FakeStore \\ + IchnaeaNlpBackend \\ + LocalGsmNlpBackend \\ + NominatimGeocoderBackend \\ AuroraServices \\ - AuroraStore" | tee "/srv/src/LINEAGE_19_1/vendor/partner_gms/products/gms_aurora.mk" + AuroraStore \\ + PdfViewer" | tee "/srv/src/LINEAGE_19_1/vendor/partner_gms/products/gms.mk" -rm "/srv/src/LINEAGE_19_1/vendor/partner_gms/products/gms_fdroid.mk" \ No newline at end of file +#rm "/srv/src/LINEAGE_19_1/vendor/partner_gms/products/gms_fdroid.mk" + +## magisk addon.d script +ADDONDIR="/build/lineage/src/LINEAGE_19_1/out/target/product/lemonadep/system/addon.d/" + +mkdir -p $ADDONDIR +curl https://raw.githubusercontent.com/topjohnwu/Magisk/master/scripts/addon.d.sh $ADDONDIR \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index fae022d..415c085 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,7 +17,7 @@ services: - "WITH_GMS=true" - "ZIP_SUBDIR=false" - "OTA_URL=https://ota.nelim.org/api" - - CUSTOM_PACKAGES="AndroidAuto gappsstub speechservicestub Droidify GCam GCamPhotosPreview GalleryAves" + - "CUSTOM_PACKAGES=AndroidAuto gappsstub speechservicestub Droidify GCamPhotosPreview" - "INCLUDE_PROPRIETARY=false" - "PARALLEL_JOBS=6" - "CLEAN_AFTER_BUILD=false" diff --git a/magiskScripts/dos2unix b/magiskScripts/dos2unix new file mode 100644 index 0000000..7bca801 --- /dev/null +++ b/magiskScripts/dos2unix @@ -0,0 +1,2 @@ +#!/bin/bash +cat $* \ No newline at end of file diff --git a/magiskScripts/getprop b/magiskScripts/getprop new file mode 100644 index 0000000..4370d94 --- /dev/null +++ b/magiskScripts/getprop @@ -0,0 +1,2 @@ +#!/bin/bash +echo $* diff --git a/magiskScripts/magisk.sh b/magiskScripts/magisk.sh index 222daa5..2aab372 100644 --- a/magiskScripts/magisk.sh +++ b/magiskScripts/magisk.sh @@ -6,3 +6,11 @@ wget https://cdn.jsdelivr.net/gh/topjohnwu/magisk-files@25.2/app-release.apk unzip app-release.apk ## helper scripts +wget +chmod 755 root-img.sh + +wget +chmod 755 dos2unix + +wget +chmod 755 getprop \ No newline at end of file diff --git a/magiskScripts/root-img.sh b/magiskScripts/root-img.sh new file mode 100644 index 0000000..09c776c --- /dev/null +++ b/magiskScripts/root-img.sh @@ -0,0 +1,15 @@ + #!/bin/bash + +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" + +export PATH=$PATH:$SCRIPT_DIR + +export BOOTMODE=true +export KEEPVERITY=true + +cp $SCRIPT_DIR/lib/x86/libmagiskboot.so $SCRIPT_DIR/assets/magiskboot +cp $SCRIPT_DIR/lib/arm64-v8a/libmagisk64.so $SCRIPT_DIR/assets/magisk64 +cp $SCRIPT_DIR/lib/armeabi-v7a/libmagisk32.so $SCRIPT_DIR/assets/magisk32 +cp $SCRIPT_DIR/lib/arm64-v8a/libmagiskinit.so $SCRIPT_DIR/assets/magiskinit + +. $SCRIPT_DIR/assets/boot_patch.sh $* \ No newline at end of file