diff --git a/AndroidManifest.xml b/AndroidManifest.xml index c62266a7..8452d452 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="97" + android:versionName="1.4.3" > "$TARGET/var/lib/dpkg/status" + : >"$TARGET/var/lib/dpkg/available" + + setup_etc + if [ ! -e "$TARGET/etc/fstab" ]; then + echo '# UNCONFIGURED FSTAB FOR BASE SYSTEM' > "$TARGET/etc/fstab" + chown 0:0 "$TARGET/etc/fstab"; chmod 644 "$TARGET/etc/fstab" + fi + + x_feign_install () { + local pkg="$1" + local deb="$(debfor $pkg)" + local ver="$(extract_deb_field "$TARGET/$deb" Version)" + + mkdir -p "$TARGET/var/lib/dpkg/info" + + echo \ +"Package: $pkg +Version: $ver +Status: install ok installed" >> "$TARGET/var/lib/dpkg/status" + + touch "$TARGET/var/lib/dpkg/info/${pkg}.list" + } + + x_feign_install dpkg +} + +second_stage_install () { + x_core_install () { + smallyes '' | in_target dpkg --force-depends --install $(debfor "$@") + } + + p () { + baseprog="$(($baseprog + ${1:-1}))" + } + + setup_devices + + if doing_variant fakechroot; then + setup_proc_fakechroot + else + setup_proc + in_target /sbin/ldconfig + fi + + DEBIAN_FRONTEND=noninteractive + DEBCONF_NONINTERACTIVE_SEEN=true + export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN + + baseprog=0 + bases=7 + + p; progress $baseprog $bases INSTCORE "Installing core packages" #1 + info INSTCORE "Installing core packages..." + + p; progress $baseprog $bases INSTCORE "Installing core packages" #2 + ln -sf mawk "$TARGET/usr/bin/awk" + x_core_install base-files base-passwd + p; progress $baseprog $bases INSTCORE "Installing core packages" #3 + x_core_install dpkg + + if [ ! -e "$TARGET/etc/localtime" ]; then + ln -sf /usr/share/zoneinfo/Etc/UTC "$TARGET/etc/localtime" + fi + + if doing_variant fakechroot; then + install_fakechroot_tools + fi + + p; progress $baseprog $bases INSTCORE "Installing core packages" #4 + x_core_install $LIBC + + p; progress $baseprog $bases INSTCORE "Installing core packages" #5 + x_core_install perl-base + + p; progress $baseprog $bases INSTCORE "Installing core packages" #6 + rm "$TARGET/usr/bin/awk" + x_core_install mawk + + p; progress $baseprog $bases INSTCORE "Installing core packages" #7 + if doing_variant -; then + x_core_install debconf + fi + + baseprog=0 + bases=$(set -- $required; echo $#) + + info UNPACKREQ "Unpacking required packages..." + + smallyes '' | + (repeatn 5 in_target_failmsg UNPACK_REQ_FAIL_FIVE "Failure while unpacking required packages. This will be attempted up to five times." "" \ + dpkg --status-fd 8 --force-depends --unpack $(debfor $required) 8>&1 1>&7 | + dpkg_progress $baseprog $bases UNPACKREQ "Unpacking required packages" UNPACKING) 7>&1 + + info CONFREQ "Configuring required packages..." + + if doing_variant fakechroot; then + # fix initscripts postinst (no mounting possible, and wrong if condition) + sed -i '/dpkg.*--compare-versions/ s/\/lt-nl/' "$TARGET/var/lib/dpkg/info/initscripts.postinst" + fi + + mv "$TARGET/sbin/start-stop-daemon" "$TARGET/sbin/start-stop-daemon.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake start-stop-daemon called, doing nothing\"" > "$TARGET/sbin/start-stop-daemon" + chmod 755 "$TARGET/sbin/start-stop-daemon" + + if [ -x "$TARGET/sbin/initctl" ]; then + mv "$TARGET/sbin/initctl" "$TARGET/sbin/initctl.REAL" + echo \ +"#!/bin/sh +echo +echo \"Warning: Fake initctl called, doing nothing\"" > "$TARGET/sbin/initctl" + chmod 755 "$TARGET/sbin/initctl" + fi + + setup_dselect_method apt + + smallyes '' | + (in_target_failmsg CONF_REQ_FAIL "Failure while configuring required packages." "" \ + dpkg --status-fd 8 --configure --pending --force-configure-any --force-depends 8>&1 1>&7 | + dpkg_progress $baseprog $bases CONFREQ "Configuring required packages" CONFIGURING) 7>&1 + + baseprog=0 + bases="$(set -- $base; echo $#)" + + info UNPACKBASE "Unpacking the base system..." + + setup_available $required $base + done_predeps= + while predep=$(get_next_predep); do + # We have to resolve dependencies of pre-dependencies manually because + # dpkg --predep-package doesn't handle this. + predep=$(without "$(without "$(resolve_deps $predep)" "$required")" "$done_predeps") + # XXX: progress is tricky due to how dpkg_progress works + # -- cjwatson 2009-07-29 + p; smallyes '' | + in_target dpkg --force-overwrite --force-confold --skip-same-version --install $(debfor $predep) + base=$(without "$base" "$predep") + done_predeps="$done_predeps $predep" + done + + smallyes '' | + (repeatn 5 in_target_failmsg INST_BASE_FAIL_FIVE "Failure while installing base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-overwrite --force-confold --skip-same-version --unpack $(debfor $base) 8>&1 1>&7 | + dpkg_progress $baseprog $bases UNPACKBASE "Unpacking base system" UNPACKING) 7>&1 + + info CONFBASE "Configuring the base system..." + + smallyes '' | + (repeatn 5 in_target_failmsg CONF_BASE_FAIL_FIVE "Failure while configuring base packages. This will be re-attempted up to five times." "" \ + dpkg --status-fd 8 --force-confold --skip-same-version --configure -a 8>&1 1>&7 | + dpkg_progress $baseprog $bases CONFBASE "Configuring base system" CONFIGURING) 7>&1 + + if [ -x "$TARGET/sbin/initctl.REAL" ]; then + mv "$TARGET/sbin/initctl.REAL" "$TARGET/sbin/initctl" + fi + mv "$TARGET/sbin/start-stop-daemon.REAL" "$TARGET/sbin/start-stop-daemon" + + progress $bases $bases CONFBASE "Configuring base system" + info BASESUCCESS "Base system installed successfully." +} diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml index b2660eea..4a6cad70 100644 --- a/res/values-ru/arrays.xml +++ b/res/values-ru/arrays.xml @@ -24,6 +24,11 @@ KDE Другое + + Не замораживать + Приостановить + Остановить + diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml index cfc88440..ef7cbe15 100644 --- a/res/values-ru/strings.xml +++ b/res/values-ru/strings.xml @@ -169,8 +169,8 @@ FB: адрес видеоустройства Устройство ввода FB: адрес устройства ввода - Приостановить Android - Временно приостановить Android UI + Заморозить Android UI + Заморозить Android UI Linux Deploy\n\nЛицензия GPL v3\n\n[ github.com , 4pda.ru ]\n\nЭта программа поставляется БЕЗ ВСЯКИХ ГАРАНТИЙ, а автор не несет ответственности за любые возможные последствия ее использования. Это свободное программное обеспечение, и вы можете распространять его при определенных условиях.\n\n© 2012-2013 Антон Скшидлевский diff --git a/res/values/arrays.xml b/res/values/arrays.xml index 4a545a25..b410dc1db 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -95,6 +95,16 @@ X Window System Frame Buffer + + none + pause + stop + + + Don\'t freeze + Pause + Stop + @@ -128,6 +138,7 @@ + saucy raring quantal precise diff --git a/res/values/preferences.xml b/res/values/preferences.xml index b86535e8..0dc20631 100644 --- a/res/values/preferences.xml +++ b/res/values/preferences.xml @@ -47,7 +47,7 @@ 100 /dev/graphics/fb0 /dev/input/event2 - false + none desktop diff --git a/res/values/strings.xml b/res/values/strings.xml index 537582e2..b0224458 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -169,8 +169,8 @@ FB: video device path Input device FB: input device path - Freeze Android - Temporarily freeze Android UI + Freeze Android UI + Freeze Android UI Linux Deploy\n\nGPL v3\n\n[ github.com , 4pda.ru ]\n\nThis program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.\n\n© 2012-2013 Anton Skshidlevsky diff --git a/res/xml/properties_framebuffer.xml b/res/xml/properties_framebuffer.xml index d7a10ba6..a197d92a 100644 --- a/res/xml/properties_framebuffer.xml +++ b/res/xml/properties_framebuffer.xml @@ -29,10 +29,13 @@ android:summary="@string/fbinput" android:title="@string/title_fbinput_preference" /> - diff --git a/src/ru/meefik/linuxdeploy/PrefStore.java b/src/ru/meefik/linuxdeploy/PrefStore.java index 578f00ad..a4bedb17 100644 --- a/src/ru/meefik/linuxdeploy/PrefStore.java +++ b/src/ru/meefik/linuxdeploy/PrefStore.java @@ -191,8 +191,7 @@ public static void get(Context c) { FB_DPI = sp.getString("fbdpi", c.getString(R.string.fbdpi)); FB_DEV = sp.getString("fbdev", c.getString(R.string.fbdev)); FB_INPUT = sp.getString("fbinput", c.getString(R.string.fbinput)); - FB_FREEZE = sp.getBoolean("fbfreeze", c.getString(R.string.fbfreeze) - .equals("true") ? true : false) ? "y" : "n"; + FB_FREEZE = sp.getString("fbfreeze", c.getString(R.string.fbfreeze)); try { VERSION = c.getPackageManager().getPackageInfo(c.getPackageName(),