Skip to content

Commit

Permalink
1.4.3
Browse files Browse the repository at this point in the history
Former-commit-id: 21c439e
  • Loading branch information
meefik committed Oct 31, 2013
1 parent 02bce55 commit ea5bd4e
Show file tree
Hide file tree
Showing 11 changed files with 263 additions and 17 deletions.
4 changes: 2 additions & 2 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="ru.meefik.linuxdeploy"
android:versionCode="96"
android:versionName="1.4.2" >
android:versionCode="97"
android:versionName="1.4.3" >

<uses-sdk
android:minSdkVersion="7"
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
Changelog (English)
===================

1.4.3
Added support Ubuntu 13.10 (Saucy Salamander)
Added three modes Android UI freeze

1.4.2
Added support Debian 8.0 (jessie)
Interface improvements
Expand Down Expand Up @@ -222,6 +226,10 @@ Updated list packages of base system installation
История изменений (Русский)
===========================

1.4.3
Добавлена поддержка Ubuntu 13.10 (Saucy Salamander)
Добавлено три режима заморозки Android UI

1.4.2
Добавлена поддержка Debian 8.0 (jessie)
Доработки интерфейса
Expand Down
18 changes: 12 additions & 6 deletions assets/home/bin/linuxdeploy
Original file line number Diff line number Diff line change
Expand Up @@ -906,17 +906,23 @@ start_system()
sed -i "s|Option.*\"fbdev\".*#linuxdeploy|Option \"fbdev\" \"$FB_DEV\" #linuxdeploy|g" $MNT_TARGET/etc/X11/xorg.conf
sed -i "s|Option.*\"Device\".*#linuxdeploy|Option \"Device\" \"$FB_INPUT\" #linuxdeploy|g" $MNT_TARGET/etc/X11/xorg.conf
(set -e
if [ "$FB_FREEZE" == "y" ]; then
#setprop ctl.stop surfaceflinger
case "$FB_FREEZE" in
stop)
setprop ctl.stop surfaceflinger
chroot $MNT_TARGET su - $USER_NAME -c "xinit -- :$FB_DISPLAY -dpi $FB_DPI"
reboot
;;
pause)
pkill -STOP system_server
pkill -STOP surfaceflinger
chroot $MNT_TARGET su - $USER_NAME -c "xinit -- :$FB_DISPLAY -dpi $FB_DPI"
pkill -CONT surfaceflinger
pkill -CONT system_server
#reboot
else
chroot $MNT_TARGET su - $USER_NAME -c "xinit -- :$FB_DISPLAY -dpi $FB_DPI &"
fi
;;
*)
chroot $MNT_TARGET su - $USER_NAME -c "xinit -- :$FB_DISPLAY -dpi $FB_DPI &"
;;
esac
exit 0)
[ $? -eq 0 ] && msg "done" || msg "fail"
else
Expand Down
214 changes: 214 additions & 0 deletions assets/home/deploy/debootstrap/scripts/saucy
Original file line number Diff line number Diff line change
@@ -0,0 +1,214 @@
case $ARCH in
amd64|i386)
default_mirror http://archive.ubuntu.com/ubuntu
;;
sparc)
case $SUITE in
gutsy)
default_mirror http://archive.ubuntu.com/ubuntu
;;
*)
default_mirror http://ports.ubuntu.com/ubuntu-ports
;;
esac
;;
*)
default_mirror http://ports.ubuntu.com/ubuntu-ports
;;
esac
mirror_style release
download_style apt
finddebs_style from-indices
variants - buildd fakechroot minbase
keyring /usr/share/keyrings/ubuntu-archive-keyring.gpg

if doing_variant fakechroot; then
test "$FAKECHROOT" = "true" || error 1 FAKECHROOTREQ "This variant requires fakechroot environment to be started"
fi

case $ARCH in
alpha|ia64) LIBC="libc6.1" ;;
*) LIBC="libc6" ;;
esac

work_out_debs () {
required="$(get_debs Priority: required)"

if doing_variant -; then
#required="$required $(get_debs Priority: important)"
# ^^ should be getting debconf here somehow maybe
base="$(get_debs Priority: important)"
elif doing_variant buildd; then
base="$(get_debs Build-Essential: yes)"
elif doing_variant fakechroot || doing_variant minbase; then
base="apt"
fi
}

first_stage_install () {
extract $required

mkdir -p "$TARGET/var/lib/dpkg"
: >"$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\>/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."
}
5 changes: 5 additions & 0 deletions res/values-ru/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
<item>KDE</item>
<item>Другое</item>
</string-array>
<string-array name="fbfreeze_entries">
<item>Не замораживать</item>
<item>Приостановить</item>
<item>Остановить</item>
</string-array>


<!-- Debian -->
Expand Down
4 changes: 2 additions & 2 deletions res/values-ru/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<string name="dialog_title_fbdev_preference">FB: адрес видеоустройства</string>
<string name="title_fbinput_preference">Устройство ввода</string>
<string name="dialog_title_fbinput_preference">FB: адрес устройства ввода</string>
<string name="title_fbfreeze_preference">Приостановить Android</string>
<string name="summary_fbfreeze_preference">Временно приостановить Android UI</string>
<string name="title_fbfreeze_preference">Заморозить Android UI</string>
<string name="dialog_title_fbfreeze_preference">Заморозить Android UI</string>
<string name="about_text"><font size="32"><b>Linux Deploy</b></font>\n\nЛицензия GPL v3\n\n[ <a href="https://github.com/meefik/linuxdeploy">github.com</a> , <a href="http://4pda.ru/forum/index.php?showtopic=378043">4pda.ru</a> ]\n\nЭта программа поставляется БЕЗ ВСЯКИХ ГАРАНТИЙ, а автор не несет ответственности за любые возможные последствия ее использования. Это свободное программное обеспечение, и вы можете распространять его при определенных условиях.\n\n&#169; 2012-2013 Антон Скшидлевский</string>

</resources>
11 changes: 11 additions & 0 deletions res/values/arrays.xml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,16 @@
<item>X Window System</item>
<item>Frame Buffer</item>
</string-array>
<string-array name="fbfreeze_values" translatable="false">
<item>none</item>
<item>pause</item>
<item>stop</item>
</string-array>
<string-array name="fbfreeze_entries">
<item>Don\'t freeze</item>
<item>Pause</item>
<item>Stop</item>
</string-array>


<!-- Debian -->
Expand Down Expand Up @@ -128,6 +138,7 @@
<!-- Ubuntu -->

<string-array name="ubuntu_suite_values" translatable="false">
<item>saucy</item>
<item>raring</item>
<item>quantal</item>
<item>precise</item>
Expand Down
2 changes: 1 addition & 1 deletion res/values/preferences.xml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<string name="fbdpi" translatable="false">100</string>
<string name="fbdev" translatable="false">/dev/graphics/fb0</string>
<string name="fbinput" translatable="false">/dev/input/event2</string>
<string name="fbfreeze" translatable="false">false</string>
<string name="fbfreeze" translatable="false">none</string>

<string-array name="default_components" translatable="false">
<item>desktop</item>
Expand Down
4 changes: 2 additions & 2 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,8 @@
<string name="dialog_title_fbdev_preference">FB: video device path</string>
<string name="title_fbinput_preference">Input device</string>
<string name="dialog_title_fbinput_preference">FB: input device path</string>
<string name="title_fbfreeze_preference">Freeze Android</string>
<string name="summary_fbfreeze_preference">Temporarily freeze Android UI</string>
<string name="title_fbfreeze_preference">Freeze Android UI</string>
<string name="dialog_title_fbfreeze_preference">Freeze Android UI</string>
<string name="about_text"><font size="32"><b>Linux Deploy</b></font>\n\nGPL v3\n\n[ <a href="https://github.com/meefik/linuxdeploy">github.com</a> , <a href="http://4pda.ru/forum/index.php?showtopic=378043">4pda.ru</a> ]\n\nThis program comes with ABSOLUTELY NO WARRANTY. This is free software, and you are welcome to redistribute it under certain conditions.\n\n&#169; 2012-2013 Anton Skshidlevsky</string>

</resources>
7 changes: 5 additions & 2 deletions res/xml/properties_framebuffer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,13 @@
android:summary="@string/fbinput"
android:title="@string/title_fbinput_preference" />

<CheckBoxPreference
<ListPreference
android:defaultValue="@string/fbfreeze"
android:dialogTitle="@string/dialog_title_fbfreeze_preference"
android:entries="@array/fbfreeze_entries"
android:entryValues="@array/fbfreeze_values"
android:key="fbfreeze"
android:summary="@string/summary_fbfreeze_preference"
android:summary="@string/fbfreeze"
android:title="@string/title_fbfreeze_preference" />
</PreferenceCategory>

Expand Down
3 changes: 1 addition & 2 deletions src/ru/meefik/linuxdeploy/PrefStore.java
Original file line number Diff line number Diff line change
Expand Up @@ -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(),
Expand Down

0 comments on commit ea5bd4e

Please sign in to comment.