busybox: use short options for hwclock - closes #4978

  Both busybox as well as big version support the same short options
  but the busybox version may be build with getopt_long turned off.

diff --git a/packages/busybox/busybox_1.11.3.bb b/packages/busybox/busybox_1.11.3.bb
index 16b23c8473e519f5c2137334c20e090a851ac547..ed7433629b9cebcbfdc4d00b68921c50041ac173 100644 (file)
--- a/packages/busybox/busybox_1.11.3.bb
+++ b/packages/busybox/busybox_1.11.3.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "\
   http://www.busybox.net/downloads/busybox-${PV}.tar.gz \

diff --git a/packages/busybox/busybox_1.13.2.bb b/packages/busybox/busybox_1.13.2.bb
index 1687f1b6b9ffa61edaa00d2af4962058cbc0e646..ccaae8d566500d9442a5d9b4882c42af66aadbc5 100644 (file)
--- a/packages/busybox/busybox_1.13.2.bb
+++ b/packages/busybox/busybox_1.13.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r4"
+PR = "r5"
 
 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 346506c10d7efb72f45267c10d62030ca93b67fa..63a93df36fbed8c994c461940f98e1e070d136e8 100644 (file)
--- a/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r18"
+PR = "r19"
 
 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 250802116a7a8517a65fb0a990aa56a1ab2b76be..fe9d07e126359ec3032e0b048d565cceeba3d129 100644 (file)
--- a/packages/busybox/busybox_1.2.2.bb
+++ b/packages/busybox/busybox_1.2.2.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/packages/busybox/busybox_1.3.1.bb b/packages/busybox/busybox_1.3.1.bb
index 4742c87d1a9f89a3de3f3bb225f515eb4569b356..2cdb81b31140a1c4fd74d76bc7d0ec1c44e419de 100644 (file)
--- a/packages/busybox/busybox_1.3.1.bb
+++ b/packages/busybox/busybox_1.3.1.bb
@@ -1,6 +1,6 @@
 require busybox.inc
 
-PR = "r4"
+PR = "r5"
 
 DEFAULT_PREFERENCE = "-1"
 

diff --git a/packages/busybox/busybox_1.7.2.bb b/packages/busybox/busybox_1.7.2.bb
index 4d93394ff4ade2d69b3495f07a654135a5c7d213..e98e25eb372fea81885139150f5f7bd2e161aebc 100644 (file)
--- a/packages/busybox/busybox_1.7.2.bb
+++ b/packages/busybox/busybox_1.7.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r10"
+PR = "r11"
 
 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 3db360423b6d86641efb3838eeb47d878621d250..77dd2a905c741777e2ba6d419e91edf06c135fcc 100644 (file)
--- a/packages/busybox/busybox_1.9.2.bb
+++ b/packages/busybox/busybox_1.9.2.bb
@@ -1,5 +1,5 @@
 require busybox.inc
-PR = "r3"
+PR = "r4"
 
 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 aab5c054af00b7c1edffb1d6a620e9fa07fb2e3c..6c0af3422ca68b555cb8c5a6e980acaf8980cf01 100644 (file)
--- a/packages/busybox/files/hwclock.sh
+++ b/packages/busybox/files/hwclock.sh
@@ -28,9 +28,9 @@ case "$1" in
                then
                        if [ -z "$TZ" ]
                        then
-                          hwclock --hctosys $UTC
+                          hwclock -s $UTC;# --hctosys
                        else
-                          TZ="$TZ" hwclock --hctosys $UTC
+                          TZ="$TZ" hwclock -s $UTC;# --hctosys
                        fi
                fi
 
@@ -53,7 +53,7 @@ case "$1" in
                fi
                if [ "$HWCLOCKACCESS" != no ]
                then
-                       hwclock --systohc $UTC
+                       hwclock -w $UTC;# --systohc
                fi
                if [ "$VERBOSE" != no ]
                then
@@ -64,7 +64,7 @@ case "$1" in
        show)
                if [ "$HWCLOCKACCESS" != no ]
                then
-                       hwclock --show $UTC
+                       hwclock -r $UTC;# --show
                fi
                ;;
         *)