miguel.horta/commandergenius
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Debian: do not update old system image, added convenient launch script

Browse Source
This commit is contained in:
Sergii Pylypenko
2020-01-09 19:43:58 +02:00
parent 7207c9cbaa
commit 4a13c9b8d1
6 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
project/jni/application/xserver-debian/AndroidAppSettings.cfg
View File

@@ -23,10 +23,10 @@ AppVersionName="20.01.07"
AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:logo.png:logo.png^!!Sloppy symlinks patch|:symlinks.tar.xz:symlinks-<ARCH>.tar.xz^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz" AppDataDownloadUrl="!!Library mapping|bin-map.zip^!!Data files|:data.tar.gz:data-2.tgz^!!Data files|:DroidSansMono.ttf:DroidSansMono.ttf^!!Loading image|:logo.png:logo.png^!!Sloppy symlinks patch|:symlinks.tar.xz:symlinks-<ARCH>.tar.xz^!!System overlay|:overlay.tar.xz:overlay-<ARCH>.tar.xz"
# Reset SDL config when updating application to the new version (y) / (n) # Reset SDL config when updating application to the new version (y) / (n)
ResetSdlConfigForThisVersion=y ResetSdlConfigForThisVersion=n
# Delete application data files when upgrading (specify file/dir paths separated by spaces) # Delete application data files when upgrading (specify file/dir paths separated by spaces)
DeleteFilesOnUpgrade="busybox usr tmp pulseaudio.conf libsdl-DownloadFinished-0.flag libsdl-DownloadFinished-1.flag libsdl-DownloadFinished-2.flag libsdl-DownloadFinished-3.flag libsdl-DownloadFinished-4.flag libsdl-DownloadFinished-5.flag libsdl-DownloadFinished-6.flag" DeleteFilesOnUpgrade="libsdl-DownloadFinished-0.flag"
# Here you may type readme text, which will be shown during startup. Format is: # Here you may type readme text, which will be shown during startup. Format is:
# Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/ # Text in English, use \\\\n to separate lines (that's four backslashes)^de:Text in Deutsch^ru:Text in Russian^button:Button that will open some URL:http://url-to-open/
@@ -299,7 +299,7 @@ AppSubdirsBuild=''
AppBuildExclude='' AppBuildExclude=''
# Application command line parameters, including app name as 0-th param # Application command line parameters, including app name as 0-th param
AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 1200 -exec $SECURE_STORAGE_DIR/usr/bin/xloadimage -onroot -fullscreen $UNSECURE_STORAGE_DIR/logo.png ; logwrapper $SECURE_STORAGE_DIR/img/proot.sh /startx.sh' AppCmdline='XSDL -nohelp -screenbuttons -warndiskspacemb 1200 -exec $SECURE_STORAGE_DIR/usr/bin/start-debian.sh'
# Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens # Screen size is used by Google Play to prevent an app to be installed on devices with smaller screens
# Minimum screen size that application supports: (s)mall / (m)edium / (l)arge # Minimum screen size that application supports: (s)mall / (m)edium / (l)arge

5
project/jni/application/xserver-debian/AndroidData/start-debian.sh Executable file
View File

@@ -0,0 +1,5 @@
#!/system/bin/sh
$SECURE_STORAGE_DIR/usr/bin/xloadimage -onroot -fullscreen $UNSECURE_STORAGE_DIR/logo.png
logwrapper $SECURE_STORAGE_DIR/img/proot.sh /startx.sh

2
project/jni/application/xserver-debian/debian-image

Submodule project/jni/application/xserver-debian/debian-image updated: d8c1956337...f8817d16f6

1
project/jni/application/xserver/AndroidBuild.sh
View File

@@ -89,6 +89,7 @@ cp -f $CURDIR/debian-image/proot-prebuilt/$1/* ./
cp -f $CURDIR/debian-image/dist/proot.sh ./ cp -f $CURDIR/debian-image/dist/proot.sh ./
cp -f $CURDIR/debian-image/dist/postinstall-img.sh ./ cp -f $CURDIR/debian-image/dist/postinstall-img.sh ./
cp -f $CURDIR/AndroidData/postinstall.sh ./ cp -f $CURDIR/AndroidData/postinstall.sh ./
cp -f $CURDIR/AndroidData/start-debian.sh ./
rm -f ../AndroidData/binaries-$1.zip rm -f ../AndroidData/binaries-$1.zip
rm -rf ../AndroidData/lib/$1 rm -rf ../AndroidData/lib/$1

3
project/jni/application/xserver/gfx.c
View File

@@ -84,7 +84,8 @@ static int unpackFiles(const char *archive, const char *script, const char *dele
if( strlen(deleteOldDataMarkerFile) > 0 && stat( fname2, &st ) == 0 ) if( strlen(deleteOldDataMarkerFile) > 0 && stat( fname2, &st ) == 0 )
{ {
__android_log_print(ANDROID_LOG_INFO, "XSDL", "Upgrade detected, showing warning dialog"); __android_log_print(ANDROID_LOG_INFO, "XSDL", "Upgrade detected, showing warning dialog");
upgradeWarning = UPGRADE_WARNING_PROCEED; //upgradeWarning = UPGRADE_WARNING_PROCEED;
upgradeWarning = UPGRADE_WARNING_CANCEL;
/* /*
upgradeWarning = UPGRADE_WARNING_ASK; upgradeWarning = UPGRADE_WARNING_ASK;
while( upgradeWarning == UPGRADE_WARNING_ASK ) while( upgradeWarning == UPGRADE_WARNING_ASK )

3
project/jni/application/xserver/java.patch
View File

@@ -161,11 +161,12 @@
+} +}
--- Settings.java --- Settings.java
+++ Settings.java +++ Settings.java
@@ -636,6 +636,7 @@ public class Settings @@ -637,6 +638,8 @@
static void setEnvVars(MainActivity p) static void setEnvVars(MainActivity p)
{ {
+ nativeSetEnv( "AUDIO_NATIVE_SAMPLE_RATE", String.valueOf(android.media.AudioTrack.getNativeOutputSampleRate(android.media.AudioManager.STREAM_MUSIC)) ); + nativeSetEnv( "AUDIO_NATIVE_SAMPLE_RATE", String.valueOf(android.media.AudioTrack.getNativeOutputSampleRate(android.media.AudioManager.STREAM_MUSIC)) );
+ nativeSetEnv( "OS_VERSION", System.getProperty("os.version", "4.0.0") );
String lang = new String(Locale.getDefault().getLanguage()); String lang = new String(Locale.getDefault().getLanguage());
if( Locale.getDefault().getCountry().length() > 0 ) if( Locale.getDefault().getCountry().length() > 0 )
lang = lang + "_" + Locale.getDefault().getCountry(); lang = lang + "_" + Locale.getDefault().getCountry();