mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-05-02 06:26:20 -04:00
Small changes
- cheeseburger/dumpling: fix ogg vorbis playback, credit @LuK1337 - cheeseburger/dumpling: fix delta ota generation - remove a few more blobs - potentially bluetooth when ant is removed on newer devices - support newer clamav - commented support for extracting boot.img when recovery.img isn't available -- fastboot.zip should be preferred - potentially fix boot on many untested newer devices (diag on msm8996+) - update cherry picks
This commit is contained in:
Tad
parent
4292bcaa3e
commit
50f44d1934
10 changed files with 57 additions and 15 deletions
|
|
@ -103,8 +103,10 @@ echo "Deblobbing..."
|
|||
ipcSec="4097:4294967295:2002:2950:3009:2901|4097:4294967295:3009";
|
||||
|
||||
#Dirac (Audio Codec + Effects) [Dirac]
|
||||
blobs=$blobs"|libDiracAPI_SHARED.so|.*dirac.*";
|
||||
blobs=$blobs"|diracmobile.config";
|
||||
if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then
|
||||
blobs=$blobs"|libDiracAPI_SHARED.so|.*dirac.*";
|
||||
blobs=$blobs"|diracmobile.config";
|
||||
fi;
|
||||
|
||||
#Discretix (DRM/HDCP) [Discretix Technologies]
|
||||
blobs=$blobs"|DxDrmServerIpc|discretix";
|
||||
|
|
@ -234,7 +236,7 @@ echo "Deblobbing..."
|
|||
blobs=$blobs"|libmm-hdcpmgr.so|libstagefright_hdcp.so|libhdcp2.so";
|
||||
blobs=$blobs"|srm.bin|insthk|hdcp_test";
|
||||
blobs=$blobs"|hdcp2xtest.srm";
|
||||
blobs=$blobs"|hdcp1.*|tzhdcp.*";
|
||||
blobs=$blobs"|hdcp1.*|hdcp2.*|tzhdcp.*";
|
||||
|
||||
#HDR
|
||||
blobs=$blobs"|libhdr.*.so|libdovi.so";
|
||||
|
|
@ -305,7 +307,7 @@ echo "Deblobbing..."
|
|||
blobs=$blobs"|cacert_location.pem|com.qti.location.sdk.xml|com.qualcomm.location.xml|izat.conf|izat.xt.srv.xml|lowi.conf|xtra_root_cert.pem|xtwifi.conf";
|
||||
blobs=$blobs"|com.qti.location.sdk.jar|izat.xt.srv.jar";
|
||||
blobs=$blobs"|com.qualcomm.location.apk|com.qualcomm.services.location.apk|xtra_t_app.apk";
|
||||
blobs=$blobs"|gpsone_daemon|izat.xt.srv|location-mq|loc_launcher|lowi-server|slim_ap_daemon|slim_daemon|xtwifi-client|xtwifi-inet-agent";
|
||||
blobs=$blobs"|gpsone_daemon|izat.xt.srv|location-mq|loc_launcher|lowi-server|slim_ap_daemon|slim_daemon|xtwifi-client|xtwifi-inet-agent|xtra-daemon";
|
||||
overlay=$overlay"config_comboNetworkLocationProvider|config_enableFusedLocationOverlay|config_enableNetworkLocationOverlay|config_fusedLocationProviderPackageName|config_enableNetworkLocationOverlay|config_networkLocationProviderPackageName|com.qualcomm.location";
|
||||
|
||||
#Misc
|
||||
|
|
@ -517,8 +519,9 @@ deblobDevice() {
|
|||
sed -i 's/BOARD_SUPPORTS_SOUND_TRIGGER_5514 := true/BOARD_SUPPORTS_SOUND_TRIGGER_5514 := false/' BoardConfig*.mk &>/dev/null || true;
|
||||
sed -i 's/AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true/AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false/' BoardConfig*.mk &>/dev/null || true; #Disable Dolby
|
||||
sed -i 's/BOARD_ANT_WIRELESS_DEVICE := true/BOARD_ANT_WIRELESS_DEVICE := false/' BoardConfig*.mk &>/dev/null || true; #Disable ANT
|
||||
awk -i inplace '!/BOARD_ANT_WIRELESS_DEVICE/' BoardConfig*.mk &>/dev/null || true;
|
||||
if [ "$DOS_DEBLOBBER_REMOVE_RENDERSCRIPT" = true ] || [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then
|
||||
awk -i inplace '!/RS_DRIVER/' BoardConfig*.mk&>/dev/null || true;
|
||||
awk -i inplace '!/RS_DRIVER/' BoardConfig*.mk &>/dev/null || true;
|
||||
fi;
|
||||
if [ -f common.mk ]; then
|
||||
awk -i inplace '!/'"$makes"'/' common.mk; #Remove references from common makefile
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ gpgVerifyDirectory() {
|
|||
export -f gpgVerifyDirectory;
|
||||
|
||||
scanForMalware() {
|
||||
if [ -x /usr/bin/clamscan ] && [ -r /var/lib/clamav/main.cvd ]; then
|
||||
if [ -x /usr/bin/clamscan ] && [ -r /var/lib/clamav/main.c*d ]; then
|
||||
echo -e "\e[0;32mStarting a malware scan...\e[0m";
|
||||
local excludes="--exclude-dir=\".git\" --exclude-dir=\".repo\"";
|
||||
local scanQueue="$2";
|
||||
|
|
@ -224,11 +224,17 @@ processRelease() {
|
|||
|
||||
#Extract signed recovery
|
||||
unzip -l $OUT_DIR/$PREFIX-target_files.zip | grep -q recovery.img;
|
||||
if [ "$?" == "0" ]; then
|
||||
local hasRecoveryImg=$?;
|
||||
if [ "$hasRecoveryImg" == "0" ]; then
|
||||
echo -e "\e[0;32mExtracting signed recovery.img\e[0m";
|
||||
mkdir $OUT_DIR/rec_tmp;
|
||||
unzip $OUT_DIR/$PREFIX-target_files.zip IMAGES/recovery.img -d $OUT_DIR/rec_tmp;
|
||||
mv $OUT_DIR/rec_tmp/IMAGES/recovery.img $OUT_DIR/$PREFIX-recovery.img;
|
||||
#else
|
||||
# echo -e "\e[0;32mExtracting signed boot.img\e[0m";
|
||||
# mkdir $OUT_DIR/rec_tmp;
|
||||
# unzip $OUT_DIR/$PREFIX-target_files.zip IMAGES/boot.img -d $OUT_DIR/rec_tmp;
|
||||
# mv $OUT_DIR/rec_tmp/IMAGES/boot.img $OUT_DIR/$PREFIX-boot.img;
|
||||
fi;
|
||||
|
||||
#Copy to archive
|
||||
|
|
@ -570,7 +576,7 @@ hardenDefconfig() {
|
|||
#Disable supported options
|
||||
#Disabled: CONFIG_MSM_SMP2P_TEST, CONFIG_MAGIC_SYSRQ (breaks compile on many kernels), CONFIG_KALLSYMS (breaks boot on select devices), CONFIG_IKCONFIG (breaks recovery)
|
||||
declare -a optionsNo=("CONFIG_ACPI_APEI_EINJ" "CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_ACPI_TABLE_UPGRADE" "CONFIG_BINFMT_AOUT" "CONFIG_BINFMT_MISC" "CONFIG_CHECKPOINT_RESTORE" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_EARJACK_DEBUGGER" "CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE" "CONFIG_HARDENED_USERCOPY_FALLBACK" "CONFIG_HIBERNATION" "CONFIG_HWPOISON_INJECT" "CONFIG_IA32_EMULATION" "CONFIG_IOMMU_NON_SECURE" "CONFIG_IP_DCCP" "CONFIG_IP_SCTP" "CONFIG_KEXEC" "CONFIG_KEXEC_FILE" "CONFIG_KSM" "CONFIG_LDISC_AUTOLOAD" "CONFIG_LEGACY_PTYS" "CONFIG_LIVEPATCH" "CONFIG_MEM_SOFT_DIRTY" "CONFIG_MMIOTRACE" "CONFIG_MMIOTRACE_TEST" "CONFIG_MODIFY_LDT_SYSCALL" "CONFIG_MSM_BUSPM_DEV" "CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG" "CONFIG_NOTIFIER_ERROR_INJECTION" "CONFIG_OABI_COMPAT" "CONFIG_PAGE_OWNER" "CONFIG_PROC_KCORE" "CONFIG_PROC_PAGE_MONITOR" "CONFIG_PROC_VMCORE" "CONFIG_RDS" "CONFIG_RDS_TCP" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_TIMER_STATS" "CONFIG_TSC" "CONFIG_TSPP2" "CONFIG_UKSM" "CONFIG_UPROBES" "CONFIG_USELIB" "CONFIG_USERFAULTFD" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_X86_PTDUMP" "CONFIG_X86_VSYSCALL_EMULATION" "CONFIG_ZSMALLOC_STAT");
|
||||
if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]] && [[ "$1" != *"kernel/amazon/hdx-common"* ]] && [[ "$1" != *"msm899"* ]]; then
|
||||
if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]] && [[ "$1" != *"kernel/amazon/hdx-common"* ]] && [[ "$1" != *"msm899"* ]] && [[ "$1" != *"sdm8"* ]] && [[ "$1" != *"sdm6"* ]]; then
|
||||
optionsNo+=("CONFIG_DIAG_CHAR" "CONFIG_DIAG_OVER_USB" "CONFIG_USB_QCOM_DIAG_BRIDGE" "CONFIG_DIAGFWD_BRIDGE_CODE" "CONFIG_DIAG_SDIO_PIPE" "CONFIG_DIAG_HSIC_PIPE" "CONFIG_INET_DIAG");
|
||||
fi;
|
||||
if [ "$DOS_DEBLOBBER_REMOVE_IPA" = true ]; then optionsNo+=("CONFIG_IPA" "CONFIG_RMNET_IPA"); fi;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue