From f6884c8beffc23bde0be79402e67115257d448e6 Mon Sep 17 00:00:00 2001 From: Teemu Ikonen Date: Mon, 5 Nov 2012 20:32:31 +0100 Subject: [PATCH] Diablo support. --- debian/busybox-power.postinst | 2 +- debian/busybox-power.preinst | 11 ++++++++--- debian/busybox-power.prerm | 4 ++-- debian/scripts/functions | 3 +++ 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/debian/busybox-power.postinst b/debian/busybox-power.postinst index 65637f3..e2d7c5a 100644 --- a/debian/busybox-power.postinst +++ b/debian/busybox-power.postinst @@ -70,7 +70,7 @@ ROLLBACK_HARMATTAN() { # dpkg-divert is disallowed on Harmattan, do not use it there! INSTALL() { case $ENVIRONMENT in - SDK|FREMANTLE) + SDK|DIABLO|FREMANTLE) /usr/sbin/dpkg-divert --local --divert $DISTBIN /bin/busybox $EXECPWR cp -f $EXECPWR /bin/busybox ;; diff --git a/debian/busybox-power.preinst b/debian/busybox-power.preinst index ca1f237..102de6d 100644 --- a/debian/busybox-power.preinst +++ b/debian/busybox-power.preinst @@ -14,8 +14,12 @@ else fi case $PROD in + RX-34|RX-44) + echo "busybox-power: Maemo4 (N8x0) environment detected" + ENVIRONMENT="DIABLO" + ;; RX-51) - echo "busybox-power: Maemo (N900) environment detected" + echo "busybox-power: Maemo5 (N900) environment detected" ENVIRONMENT="FREMANTLE" ;; RM-680|RM-696) @@ -34,11 +38,12 @@ case $ENVIRONMENT in # Extra warning doesn't apply to SDK, just exit exit 0 ;; - FREMANTLE) + DIABLO|FREMANTLE) f=/tmp/busybox-power-msg cat > $f <> /tmp/busybox-power-error echo "Please confirm the text on the screen of your device" @@ -152,7 +152,7 @@ UNINSTALL() { fi case $ENVIRONMENT in - SDK|FREMANTLE) + SDK|DIABLO|FREMANTLE) if test -e $DISTBIN; then cp -af $DISTBIN /bin/busybox if test -e /bin/busybox; then diff --git a/debian/scripts/functions b/debian/scripts/functions index eb79512..2d36913 100644 --- a/debian/scripts/functions +++ b/debian/scripts/functions @@ -25,6 +25,9 @@ CHECK_ENV() { fi case $PROD in + RX-34|RX-44) + ENVIRONMENT="DIABLO" + ;; RX-51) ENVIRONMENT="FREMANTLE" ;; -- 1.7.9.5