diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index de4d4f8225..695d694bb8 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -1,5 +1,8 @@ #!/bin/bash +# Date executable points to /bin/busybox\ date explicitly in the cases that date binary gets overwritten +date_exec=/bin/busybox\ date + sys_conf="/etc/date.conf" boot_conf="/boot/date.conf" conf="/data/etc/date.conf" @@ -41,7 +44,7 @@ source $conf set_current_date_http() { date_str=$(curl -v -s -m $date_timeout -X GET http://$date_host 2>&1 | grep Date | sed -e 's/< Date: //') test -z "$date_str" && return 1 - date -u -D "%a, %d %b %Y %H:%M:%S" -s "$date_str" > /dev/null + $date_exec -u -D "%a, %d %b %Y %H:%M:%S" -s "$date_str" > /dev/null return $? } @@ -52,7 +55,7 @@ set_current_date_ntp() { start_http() { msg_begin "Setting current date using http" set_current_date_http || set_current_date_http - test $? == 0 && msg_done "$(date)" || msg_fail + test $? == 0 && msg_done "$($date_exec)" || msg_fail msg_begin "Starting http date updater" while true; do @@ -78,7 +81,7 @@ start_ntp() { msg_begin "Setting current date using ntp" set_current_date_ntp || set_current_date_ntp - test $? == 0 && msg_done "$(date)" || msg_fail + test $? == 0 && msg_done "$($date_exec)" || msg_fail msg_begin "Starting ntpd" ntpd -g -c $ntp_conf @@ -104,7 +107,7 @@ start() { start_ntp fi - echo "system date is $(date '+%Y-%m-%d %H:%M:%S')" > /dev/kmsg + echo "system date is $($date_exec '+%Y-%m-%d %H:%M:%S')" > /dev/kmsg } stop() { diff --git a/board/common/overlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin b/board/common/overlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin new file mode 100644 index 0000000000..4a034d3ae8 Binary files /dev/null and b/board/common/overlay/lib/firmware/rtlwifi/rtl8192eu_nic.bin differ diff --git a/package/ffmpeg/ffmpeg.hash b/package/ffmpeg/ffmpeg.hash index 77e185f5ed..42cfeed68e 100644 --- a/package/ffmpeg/ffmpeg.hash +++ b/package/ffmpeg/ffmpeg.hash @@ -1,3 +1,2 @@ # Locally calculated -sha256 54ce502aca10b7e6059f19220ea2f68fa0c9c4c4d255ae13e615f08f0c94dcc5 ffmpeg-3.2.3.tar.xz -sha256 1998de1ab32616cbf2ff86efc3f1f26e76805ec5dc51e24c041c79edd8262785 ffmpeg-3.3.2.tar.xz +sha256 98b97e1b908dfeb6aeb6d407e5a5eacdfc253a40c2d195f5867ed2d1d46ea957 ffmpeg-3.3.4.tar.xz diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 4bdd9e6f50..98f4100504 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 3.3.2 +FFMPEG_VERSION = 3.3.4 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.xz FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES