summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Lee <john_lee@openmoko.com>2008-09-02 14:42:18 +0800
committerJohn Lee <john_lee@openmoko.org>2008-12-18 23:32:46 +0800
commit5dfd955669ef9fbd49ec68587c5c39f332b40b26 (patch)
tree552cfe9ec3a856f0a65f5e51224478420720c576
parentfb198a1b364f29acb52f1f2b5f3c43a5ba3e78a2 (diff)
busybox: update hwclock.sh to honor the UTC setting in /etc/default/rcS
...and increase PR of every consumer.
-rw-r--r--packages/busybox/busybox_1.11.3.bb2
-rw-r--r--packages/busybox/busybox_1.2.1.bb2
-rw-r--r--packages/busybox/busybox_1.2.2.bb2
-rw-r--r--packages/busybox/busybox_1.3.1.bb2
-rw-r--r--packages/busybox/busybox_1.7.2.bb2
-rw-r--r--packages/busybox/busybox_1.9.2.bb2
-rw-r--r--packages/busybox/files/hwclock.sh10
7 files changed, 12 insertions, 10 deletions
diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index 09eddaeb6b..3956c4878b 100644
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "\
http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
diff --git a/packages/busybox/busybox_1.2.1.bb b/packages/busybox/busybox_1.2.1.bb
index 4ef3cfeb66..346506c10d 100644
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
require busybox.inc
-PR = "r17"
+PR = "r18"
SRC_URI += "file://wget-long-options.patch;patch=1 \
file://df_rootfs.patch;patch=1 \
diff --git a/packages/busybox/busybox_1.2.2.bb b/packages/busybox/busybox_1.2.2.bb
index 14379a5da6..250802116a 100644
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
require busybox.inc
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 31a2f1abe7..4742c87d1a 100644
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
require busybox.inc
-PR = "r3"
+PR = "r4"
DEFAULT_PREFERENCE = "-1"
diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 53304df387..4d93394ff4 100644
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r9"
+PR = "r10"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://busybox-cron \
diff --git a/packages/busybox/busybox_1.9.2.bb b/packages/busybox/busybox_1.9.2.bb
index e5c0f2473c..3db360423b 100644
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
require busybox.inc
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
file://udhcpscript.patch;patch=1 \
diff --git a/packages/busybox/files/hwclock.sh b/packages/busybox/files/hwclock.sh
index 5acfb9fb24..aab5c054af 100644
--- a/packages/busybox/files/hwclock.sh
+++ b/packages/busybox/files/hwclock.sh
@@ -14,6 +14,8 @@
. /etc/default/rcS
+[ "$UTC" = yes ] && UTC=--utc || UTC=--localtime
+
case "$1" in
start)
if [ "$VERBOSE" != no ]
@@ -26,9 +28,9 @@ case "$1" in
then
if [ -z "$TZ" ]
then
- hwclock --hctosys
+ hwclock --hctosys $UTC
else
- TZ="$TZ" hwclock --hctosys
+ TZ="$TZ" hwclock --hctosys $UTC
fi
fi
@@ -51,7 +53,7 @@ case "$1" in
fi
if [ "$HWCLOCKACCESS" != no ]
then
- hwclock --systohc
+ hwclock --systohc $UTC
fi
if [ "$VERBOSE" != no ]
then
@@ -62,7 +64,7 @@ case "$1" in
show)
if [ "$HWCLOCKACCESS" != no ]
then
- hwclock --show
+ hwclock --show $UTC
fi
;;
*)