diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 27624e86..18f6791f 100755 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -54,9 +54,7 @@ echo "Deblobbing..." sepolicy=$sepolicy" atfwd.te"; #AudioFX (Audio Effects) [Qualcomm] - if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then - blobs=$blobs"|libqcbassboost.so|libqcreverb.so|libqcvirt.so"; - fi; + if [ "$DEBLOBBER_REMOVE_AUDIOFX" = true ]; then blobs=$blobs"|libqcbassboost.so|libqcreverb.so|libqcvirt.so"; fi; #Camera #Attempted, don't waste your time... @@ -197,9 +195,9 @@ echo "Deblobbing..." #Time Service [Qualcomm] #Requires that https://github.com/LineageOS/android_hardware_sony_timekeep be included in repo manifest if [ "$DEBLOBBER_REPLACE_TIME" = true ]; then - #blobs=$blobs"|libtime_genoff.so"; #XXX: Breaks radio - blobs=$blobs"|libTimeService.so|time_daemon|TimeService.apk"; - sepolicy=$sepolicy" qtimeservice.te"; + #blobs=$blobs"|libtime_genoff.so"; #XXX: Breaks radio + blobs=$blobs"|libTimeService.so|time_daemon|TimeService.apk"; + sepolicy=$sepolicy" qtimeservice.te"; fi; #Venus (Hardware Video Decoding) [Qualcomm] @@ -350,7 +348,7 @@ deblobDevice() { rm -rf libshimwvm libshims/wvm_shim.cpp; #Remove Google Widevine compatibility module rm -rf board/qcom-wipower.mk product/qcom-wipower.mk; #Remove WiPower makefiles if [ -f setup-makefiles.sh ]; then - awk -i inplace '!/'"$blobs"'/' ./*proprietary*.txt; #Remove all blob references from blob manifest + awk -i inplace '!/'$blobs'/' ./*proprietary*.txt; #Remove all blob references from blob manifest bash -c "cd $base$devicePath && ./setup-makefiles.sh"; #Update the makefiles fi; cd "$base"; @@ -360,7 +358,7 @@ export -f deblobDevice; deblobKernel() { kernelPath="$1"; cd "$base$kernelPath"; - rm -rf "$kernels"; + rm -rf $kernels; cd "$base"; } export -f deblobKernel; @@ -370,7 +368,7 @@ deblobSepolicy() { cd "$base$sepolicyPath"; if [ -d sepolicy ]; then cd sepolicy; - rm -f "$sepolicy"; + rm -f $sepolicy; fi; cd "$base"; } @@ -378,14 +376,14 @@ export -f deblobSepolicy; deblobVendors() { cd "$base"; - find vendor -regextype posix-extended -regex '.*('"$blobs"')' -type f -delete; #Delete all blobs + find vendor -regextype posix-extended -regex '.*('$blobs')' -type f -delete; #Delete all blobs } export -f deblobVendors; deblobVendor() { makefile="$1"; cd "$base"; - awk -i inplace '!/'"$blobs"'/' "$makefile"; #Remove all blob references from makefile + awk -i inplace '!/'$blobs'/' "$makefile"; #Remove all blob references from makefile } export -f deblobVendor; # diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index df174ac5..390de312 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -180,14 +180,14 @@ getDefconfig() { else defconfigPath="arch/arm/configs/*defconfig arch/arm64/configs/*defconfig"; fi; - echo "$defconfigPath"; + echo $defconfigPath; #echo "Found defconfig at $defconfigPath" } export -f getDefconfig; editKernelLocalversion() { defconfigPath=$(getDefconfig) - sed -i 's/CONFIG_LOCALVERSION=".*"/CONFIG_LOCALVERSION="'"$1"'"/' "$defconfigPath" &>/dev/null || true; + sed -i 's/CONFIG_LOCALVERSION=".*"/CONFIG_LOCALVERSION="'"$1"'"/' $defconfigPath &>/dev/null || true; } export -f editKernelLocalversion; @@ -204,11 +204,11 @@ hardenDefconfig() { declare -a optionsYes=("CONFIG_ARM64_SW_TTBR0_PAN" "CONFIG_BUG" "CONFIG_BUG_ON_DATA_CORRUPTION" "CONFIG_CC_STACKPROTECTOR" "CONFIG_CC_STACKPROTECTOR_STRONG" "CONFIG_CPU_SW_DOMAIN_PAN" "CONFIG_DEBUG_CREDENTIALS" "CONFIG_DEBUG_KERNEL" "CONFIG_DEBUG_LIST" "CONFIG_DEBUG_NOTIFIERS" "CONFIG_DEBUG_RODATA" "CONFIG_DEBUG_WX" "CONFIG_FORTIFY_SOURCE" "CONFIG_GCC_PLUGIN_LATENT_ENTROPY" "CONFIG_GCC_PLUGIN_RANDSTRUCT" "CONFIG_GCC_PLUGINS" "CONFIG_GCC_PLUGIN_STRUCTLEAK" "CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL" "CONFIG_HARDENED_USERCOPY" "CONFIG_IO_STRICT_DEVMEM" "CONFIG_KAISER" "CONFIG_LEGACY_VSYSCALL_NONE" "CONFIG_PAGE_POISONING" "CONFIG_PAGE_POISONING_NO_SANITY" "CONFIG_PAGE_POISONING_ZERO" "CONFIG_PAGE_TABLE_ISOLATION" "CONFIG_PANIC_ON_OOPS" "CONFIG_RANDOMIZE_BASE" "CONFIG_REFCOUNT_FULL" "CONFIG_RETPOLINE" "CONFIG_SCHED_STACK_END_CHECK" "CONFIG_SECCOMP" "CONFIG_SECCOMP_FILTER" "CONFIG_SECURITY" "CONFIG_SECURITY_PERF_EVENTS_RESTRICT" "CONFIG_SECURITY_YAMA" "CONFIG_SECURITY_YAMA_STACKED" "CONFIG_SLAB_FREELIST_RANDOM" "CONFIG_SLAB_HARDENED" "CONFIG_SLUB_DEBUG" "CONFIG_STRICT_DEVMEM" "CONFIG_STRICT_KERNEL_RWX" "CONFIG_STRICT_MEMORY_RWX" "CONFIG_SYN_COOKIES" "CONFIG_UNMAP_KERNEL_AT_EL0" "CONFIG_VMAP_STACK" "CONFIG_SECURITY_DMESG_RESTRICT" "CONFIG_SLAB_FREELIST_HARDENED" "CONFIG_GCC_PLUGINS" "CONFIG_GCC_PLUGIN_LATENT_ENTROPY" "CONFIG_GCC_PLUGIN_STRUCTLEAK" "CONFIG_GCC_PLUGIN_STRUCTLEAK_BYREF_ALL" "CONFIG_GCC_PLUGIN_RANDSTRUCT" "CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE") for option in "${optionsYes[@]}" do - sed -i 's/# '"$option"' is not set/'"$option"'=y/' "$defconfigPath" &>/dev/null || true; + sed -i 's/# '"$option"' is not set/'"$option"'=y/' $defconfigPath &>/dev/null || true; #Some defconfigs are very minimal/not-autogenerated, so lets add the rest. Obviously most won't have any affect as they aren't supported. if [[ "$defconfigPath" == *"lineage"* ]]; then - if ! grep -q "$option""=y" "$defconfigPath"; then - echo "$option""=y" | tee -a "$defconfigPath" > /dev/null; + if ! grep -q "$option""=y" $defconfigPath; then + echo "$option""=y" | tee -a $defconfigPath > /dev/null; fi; fi; done @@ -217,13 +217,13 @@ hardenDefconfig() { declare -a optionsNo=("CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_BINFMT_MISC" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_HIBERNATION" "CONFIG_INET_DIAG" "CONFIG_KEXEC" "CONFIG_LEGACY_PTYS" "CONFIG_MSM_BUSPM_DEV" "CONFIG_OABI_COMPAT" "CONFIG_PROC_KCORE" "CONFIG_PROC_VMCORE" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_WLAN_FEATURE_MEMDUMP") for option in "${optionsNo[@]}" do - sed -i 's/'"$option"'=y/# '"$option"' is not set/' "$defconfigPath" &>/dev/null || true; + sed -i 's/'"$option"'=y/# '"$option"' is not set/' $defconfigPath &>/dev/null || true; done #Extras - sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=8/CONFIG_ARCH_MMAP_RND_BITS=16/' "$defconfigPath" &>/dev/null || true; - sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=18/CONFIG_ARCH_MMAP_RND_BITS=24/' "$defconfigPath" &>/dev/null || true; - sed -i 's/CONFIG_DEFAULT_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' "$defconfigPath" &>/dev/null || true; - sed -i 's/CONFIG_LSM_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' "$defconfigPath" &>/dev/null || true; + sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=8/CONFIG_ARCH_MMAP_RND_BITS=16/' $defconfigPath &>/dev/null || true; + sed -i 's/CONFIG_ARCH_MMAP_RND_BITS=18/CONFIG_ARCH_MMAP_RND_BITS=24/' $defconfigPath &>/dev/null || true; + sed -i 's/CONFIG_DEFAULT_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; + sed -i 's/CONFIG_LSM_MMAP_MIN_ADDR=4096/CONFIG_DEFAULT_MMAP_MIN_ADDR=32768/' $defconfigPath &>/dev/null || true; editKernelLocalversion "-dos";