From 28bf88c8125d4afe5d4464676190a6ccefa5d2a9 Mon Sep 17 00:00:00 2001 From: Michael Mrozek Date: Tue, 18 Jan 2011 02:24:28 +0100 Subject: [PATCH] pandora-first-run-wizard and op_datetime: Switched off screen blanking so that screen won't switch off when changing date. --- recipes/pandora-system/pandora-first-run-wizard.bb | 2 +- .../pandora-first-run-wizard/first-run-wizard.sh | 3 +++ recipes/pandora-system/pandora-scripts.bb | 2 +- recipes/pandora-system/pandora-scripts/op_datetime.sh | 6 +++++- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/recipes/pandora-system/pandora-first-run-wizard.bb b/recipes/pandora-system/pandora-first-run-wizard.bb index 003568a..1c29d87 100755 --- a/recipes/pandora-system/pandora-first-run-wizard.bb +++ b/recipes/pandora-system/pandora-first-run-wizard.bb @@ -6,7 +6,7 @@ RDEPENDS = "hsetroot zenity dbus pandora-wallpaper-official tslib tslib-calibrat COMPATIBLE_MACHINE = "omap3-pandora" -PR = "r22" +PR = "r23" SRC_URI = " \ file://first-run-wizard.sh \ diff --git a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh index ad81fdc..bf32b47 100755 --- a/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh +++ b/recipes/pandora-system/pandora-first-run-wizard/first-run-wizard.sh @@ -22,6 +22,8 @@ ERROR_WINDOW='zenity --title="Error" --error --text="Sorry! Please try again." - RESET_ROOT="yes" +xset s off + # Greet the user. if zenity --question --title="Pandoras Box has been opened." --text="Welcome!\n\nPandora's Box has been opened.\n\nThis wizard will help you setting up your new OpenPandora handheld before the first use.\n\nYou will be asked a few simple questions to personalise and configure your device.\n\nDo you want to set up your unit now or shut the unit down and do it later?" --ok-label="Start now" --cancel-label="Shutdown" ; then @@ -241,6 +243,7 @@ touch /etc/pandora/first-boot # Make the control file writeable by all to allow the user to delete to rerun the wizard on next boot. chmod 0666 /etc/pandora/first-boot +xset s on # ---- else poweroff diff --git a/recipes/pandora-system/pandora-scripts.bb b/recipes/pandora-system/pandora-scripts.bb index b0e4e62..d30e58a 100644 --- a/recipes/pandora-system/pandora-scripts.bb +++ b/recipes/pandora-system/pandora-scripts.bb @@ -6,7 +6,7 @@ COMPATIBLE_MACHINE = "omap3-pandora" DEPENDS = "zenity dbus" RDEPENDS = "zenity dbus" -PR = "r49" +PR = "r50" SRC_URI = " \ file://op_bright.sh \ diff --git a/recipes/pandora-system/pandora-scripts/op_datetime.sh b/recipes/pandora-system/pandora-scripts/op_datetime.sh index 998c88d..3f5a1ce 100755 --- a/recipes/pandora-system/pandora-scripts/op_datetime.sh +++ b/recipes/pandora-system/pandora-scripts/op_datetime.sh @@ -35,6 +35,10 @@ done while ! date -d $time ; do time=$(zenity --title="Enter actual time" --entry --text "Please enter the time in 24hour format (HH:MM):" --entry-text "$time_h:$time_m") done - + +xset s off + date +%Y%m%d -s $date date +%H:%M -s $time + +xset s on \ No newline at end of file -- 2.39.5