Git-Mirrors/DivestOS
1
0
Fork 0
mirror of https://github.com/Divested-Mobile/DivestOS-Build.git synced 2024-10-01 01:35:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

glibc 2.34 fix

Browse Source 
Tested working to compile mako on Fedora 35

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2021-11-14 19:44:53 -05:00
parent b8f5d8a510
commit f950398fa1
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Patches/LineageOS-18.1/android_packages_apps_SetupWizard/0001-Remove_Analytics.patch
View File

@ -90,7 +90,7 @@ index f081e2b..1a9bbe9 100644
if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) { if (setupWizardApp.getSettingsBundle().containsKey(DISABLE_NAV_KEYS)) {
writeDisableNavkeysOption(setupWizardApp, writeDisableNavkeysOption(setupWizardApp,
diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java diff --git a/src/org/lineageos/setupwizard/LineageSettingsActivity.java b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
index 4f5519d..c1f3698 100644 index a72d916..b5509cc 100644
--- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java --- a/src/org/lineageos/setupwizard/LineageSettingsActivity.java
+++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java +++ b/src/org/lineageos/setupwizard/LineageSettingsActivity.java
@@ -18,7 +18,6 @@ @@ -18,7 +18,6 @@
@ -119,7 +119,7 @@ index 4f5519d..c1f3698 100644
private final View.OnClickListener mNavKeysClickListener = view -> { private final View.OnClickListener mNavKeysClickListener = view -> {
boolean checked = !mNavKeys.isChecked(); boolean checked = !mNavKeys.isChecked();
mNavKeys.setChecked(checked); mNavKeys.setChecked(checked);
@@ -97,19 +89,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -99,19 +91,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance()); privacyPolicy.setMovementMethod(LinkMovementMethod.getInstance());
privacyPolicy.setText(ss); privacyPolicy.setText(ss);
@ -139,7 +139,7 @@ index 4f5519d..c1f3698 100644
View navKeysRow = findViewById(R.id.nav_keys); View navKeysRow = findViewById(R.id.nav_keys);
navKeysRow.setOnClickListener(mNavKeysClickListener); navKeysRow.setOnClickListener(mNavKeysClickListener);
mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox); mNavKeys = (CheckBox) findViewById(R.id.nav_keys_checkbox);
@@ -126,7 +105,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -128,7 +107,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
updateDisableNavkeysOption(); updateDisableNavkeysOption();
@ -147,7 +147,7 @@ index 4f5519d..c1f3698 100644
} }
@Override @Override
@@ -150,15 +128,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity { @@ -152,15 +130,6 @@ public class LineageSettingsActivity extends BaseSetupWizardActivity {
return R.drawable.ic_features; return R.drawable.ic_features;
} }
@ -164,10 +164,10 @@ index 4f5519d..c1f3698 100644
if (mSupportsKeyDisabler) { if (mSupportsKeyDisabler) {
final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle(); final Bundle myPageBundle = mSetupWizardApp.getSettingsBundle();
diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java diff --git a/src/org/lineageos/setupwizard/SetupWizardApp.java b/src/org/lineageos/setupwizard/SetupWizardApp.java
index b1755c7..c299457 100644 index 38bba83..62d75f2 100644
--- a/src/org/lineageos/setupwizard/SetupWizardApp.java --- a/src/org/lineageos/setupwizard/SetupWizardApp.java
+++ b/src/org/lineageos/setupwizard/SetupWizardApp.java +++ b/src/org/lineageos/setupwizard/SetupWizardApp.java
@@ -59,7 +59,6 @@ public class SetupWizardApp extends Application { @@ -60,7 +60,6 @@ public class SetupWizardApp extends Application {
public static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect"; public static final String EXTRA_ENABLE_NEXT_ON_CONNECT = "wifi_enable_next_on_connect";
public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled"; public static final String KEY_DETECT_CAPTIVE_PORTAL = "captive_portal_detection_enabled";

6
Scripts/LineageOS-17.1/Patch.sh
View File

@ -279,6 +279,12 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
sed -i 's/messaging/Silence/' config/telephony.mk; #Replace the Messaging app with Silence sed -i 's/messaging/Silence/' config/telephony.mk; #Replace the Messaging app with Silence
if [ "$DOS_HOST_GLIBC2_34" = true ]; then
#fix compile with glibc 2.34
#like 318916, but keeps 259778
sed -i 's|/usr/include:/usr/include/x86_64-linux-gnu|/usr/include/openssl|' config/BoardConfigKernel.mk;
sed -i 's|-L/usr/lib/x86_64-linux-gnu -L/usr/lib64|-L/usr/lib64/libcrypto.so -L/usr/lib64/libssl.so|' config/BoardConfigKernel.mk;
fi;
fi; fi;
if enter "vendor/divested"; then if enter "vendor/divested"; then

6
Scripts/LineageOS-18.1/Patch.sh
View File

@ -277,6 +277,12 @@ if [ "$DOS_NON_COMMERCIAL_USE_PATCHES" = true ]; then sed -i 's/LINEAGE_BUILDTYP
echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations echo 'include vendor/divested/divestos.mk' >> config/common.mk; #Include our customizations
cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list cp -f "$DOS_PATCHES_COMMON/apns-conf.xml" prebuilt/common/etc/apns-conf.xml; #Update APN list
sed -i 's/messaging/Silence/' config/telephony.mk; #Replace the Messaging app with Silence sed -i 's/messaging/Silence/' config/telephony.mk; #Replace the Messaging app with Silence
if [ "$DOS_HOST_GLIBC2_34" = true ]; then
#fix compile with glibc 2.34
#like 318916, but keeps 259778
sed -i 's|/usr/include:/usr/include/x86_64-linux-gnu|/usr/include/openssl|' config/BoardConfigKernel.mk;
sed -i 's|-L/usr/lib/x86_64-linux-gnu -L/usr/lib64|-L/usr/lib64/libcrypto.so -L/usr/lib64/libssl.so|' config/BoardConfigKernel.mk;
fi;
fi; fi;
if enter "vendor/divested"; then if enter "vendor/divested"; then

1
Scripts/init.sh
View File

@ -37,6 +37,7 @@ export DOS_TOR_WRAPPER="";
export DOS_MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll() export DOS_MALWARE_SCAN_ENABLED=true; #Set true to perform a fast scan on patchWorkspace() and a through scan on buildAll()
export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full export DOS_MALWARE_SCAN_SETTING="quick"; #buildAll() scan speed. Options: quick, extra, slow, full
export DOS_REFRESH_PATCHES=true; #Set true to refresh branch-specific patches on apply export DOS_REFRESH_PATCHES=true; #Set true to refresh branch-specific patches on apply
export DOS_HOST_GLIBC2_34=true; #Set true to enable a glibc 2.34+ workaround XXX: hard-coded to Fedora 35 paths
#Deblobber #Deblobber
export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of external accessories that depend on blobs export DOS_DEBLOBBER_REMOVE_ACCESSORIES=true; #Set false to allow use of external accessories that depend on blobs