From c8d2f1e4b430b7102751747353d193b7f1a26cb2 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 5 Feb 2019 11:30:29 +0200 Subject: [PATCH 01/16] fwupdate: remove unused backup_conf function --- board/common/overlay/sbin/fwupdate | 5 ----- 1 file changed, 5 deletions(-) diff --git a/board/common/overlay/sbin/fwupdate b/board/common/overlay/sbin/fwupdate index 19c8b53ca8..78dd4c58ca 100755 --- a/board/common/overlay/sbin/fwupdate +++ b/board/common/overlay/sbin/fwupdate @@ -530,11 +530,6 @@ function new_version() { cat ${VER_FILE} } -function backup_conf() { - echo "backing up /data/etc..." - tar -acf /boot/backup-etc-${OS_VERSION}.tar.gz -C /data etc -} - function show_status() { status=$(flash_boot_status) if [[ "${status}" == "running" ]]; then From 6e6311ac2ab76ddd437983c755ea153f7737b7ec Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 10 Sep 2019 22:18:10 +0300 Subject: [PATCH 02/16] rpi-userland: properly install libfdt.so --- package/rpi-userland/rpi-userland.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index 7d92158f0c..df32acb790 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -14,6 +14,13 @@ RPI_USERLAND_CONF_OPTS = -DVMCS_INSTALL_PREFIX=/usr \ RPI_USERLAND_PROVIDES = libegl libgles libopenmax libopenvg +define RPI_USERLAND_INSTALL_LIBFDT_TARGET + $(INSTALL) -m 0644 -D \ + $(@D)/build/lib/libfdt.so \ + $(TARGET_DIR)/usr/lib/libfdt.so +endef +RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_INSTALL_LIBFDT_TARGET + ifeq ($(BR2_PACKAGE_RPI_USERLAND_HELLO),y) RPI_USERLAND_CONF_OPTS += -DALL_APPS=ON @@ -22,9 +29,6 @@ define RPI_USERLAND_EXTRA_LIBS_TARGET $(INSTALL) -m 0644 -D \ $(@D)/build/lib/libilclient.so \ $(TARGET_DIR)/usr/lib/libilclient.so - $(INSTALL) -m 0644 -D \ - $(@D)/build/lib/libfdt.so \ - $(TARGET_DIR)/usr/lib/libfdt.so endef RPI_USERLAND_POST_INSTALL_TARGET_HOOKS += RPI_USERLAND_EXTRA_LIBS_TARGET From b85178b17846ec6ccf11f92a80d231c79af325d7 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 10 Sep 2019 23:20:03 +0300 Subject: [PATCH 03/16] Raspberry Pi (all): mount configfs at startup --- board/common/overlay/etc/init.d/mountsys | 6 +----- board/raspberrypi/overlay/etc/fstab.sys | 7 +++++++ board/raspberrypi2/overlay/etc/fstab.sys | 7 +++++++ board/raspberrypi3/overlay/etc/fstab.sys | 7 +++++++ board/raspberrypi4/overlay/etc/fstab.sys | 7 +++++++ 5 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 board/raspberrypi/overlay/etc/fstab.sys create mode 100644 board/raspberrypi2/overlay/etc/fstab.sys create mode 100644 board/raspberrypi3/overlay/etc/fstab.sys create mode 100644 board/raspberrypi4/overlay/etc/fstab.sys diff --git a/board/common/overlay/etc/init.d/mountsys b/board/common/overlay/etc/init.d/mountsys index 1963d2f2a3..d61d249ce7 100755 --- a/board/common/overlay/etc/init.d/mountsys +++ b/board/common/overlay/etc/init.d/mountsys @@ -3,8 +3,4 @@ /bin/mkdir -p /dev/pts /bin/mkdir -p /dev/shm /bin/mount --make-shared / -/bin/mount -T /etc/fstab.sys -a -t proc -/bin/mount -T /etc/fstab.sys -a -t devpts -/bin/mount -T /etc/fstab.sys -a -t tmpfs -/bin/mount -T /etc/fstab.sys -a -t sysfs - +/bin/mount -T /etc/fstab.sys -a diff --git a/board/raspberrypi/overlay/etc/fstab.sys b/board/raspberrypi/overlay/etc/fstab.sys new file mode 100644 index 0000000000..acc6225063 --- /dev/null +++ b/board/raspberrypi/overlay/etc/fstab.sys @@ -0,0 +1,7 @@ +# +proc /proc proc defaults 0 0 +devpts /dev/pts devpts gid=5,mode=620 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /tmp tmpfs mode=1777 0 0 +sysfs /sys sysfs defaults 0 0 +configfs /sys/kernel/config configfs defaults 0 0 diff --git a/board/raspberrypi2/overlay/etc/fstab.sys b/board/raspberrypi2/overlay/etc/fstab.sys new file mode 100644 index 0000000000..acc6225063 --- /dev/null +++ b/board/raspberrypi2/overlay/etc/fstab.sys @@ -0,0 +1,7 @@ +# +proc /proc proc defaults 0 0 +devpts /dev/pts devpts gid=5,mode=620 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /tmp tmpfs mode=1777 0 0 +sysfs /sys sysfs defaults 0 0 +configfs /sys/kernel/config configfs defaults 0 0 diff --git a/board/raspberrypi3/overlay/etc/fstab.sys b/board/raspberrypi3/overlay/etc/fstab.sys new file mode 100644 index 0000000000..acc6225063 --- /dev/null +++ b/board/raspberrypi3/overlay/etc/fstab.sys @@ -0,0 +1,7 @@ +# +proc /proc proc defaults 0 0 +devpts /dev/pts devpts gid=5,mode=620 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /tmp tmpfs mode=1777 0 0 +sysfs /sys sysfs defaults 0 0 +configfs /sys/kernel/config configfs defaults 0 0 diff --git a/board/raspberrypi4/overlay/etc/fstab.sys b/board/raspberrypi4/overlay/etc/fstab.sys new file mode 100644 index 0000000000..acc6225063 --- /dev/null +++ b/board/raspberrypi4/overlay/etc/fstab.sys @@ -0,0 +1,7 @@ +# +proc /proc proc defaults 0 0 +devpts /dev/pts devpts gid=5,mode=620 0 0 +tmpfs /dev/shm tmpfs mode=0777 0 0 +tmpfs /tmp tmpfs mode=1777 0 0 +sysfs /sys sysfs defaults 0 0 +configfs /sys/kernel/config configfs defaults 0 0 From c1de43870b4173725c32a24ff524ce91d86b0ff8 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Tue, 10 Sep 2019 23:31:33 +0300 Subject: [PATCH 04/16] Raspberry Pi (all): copy overlays to /boot/overlays --- board/raspberrypi/postscript.sh | 3 +++ board/raspberrypi2/postscript.sh | 3 +++ board/raspberrypi3/postscript.sh | 3 +++ board/raspberrypi4/postscript.sh | 4 ++++ 4 files changed, 13 insertions(+) diff --git a/board/raspberrypi/postscript.sh b/board/raspberrypi/postscript.sh index 077520008b..ee8141625b 100755 --- a/board/raspberrypi/postscript.sh +++ b/board/raspberrypi/postscript.sh @@ -17,3 +17,6 @@ cp ${RPI_FW_DIR}/bootcode.bin ${BOOT_DIR} cp ${RPI_FW_DIR}/start.elf ${BOOT_DIR} cp ${RPI_FW_DIR}/fixup.dat ${BOOT_DIR} +# copy overlays +mkdir -p ${BOOT_DIR}/overlays +cp ${RPI_FW_DIR}/overlays/*.dtbo ${BOOT_DIR}/overlays diff --git a/board/raspberrypi2/postscript.sh b/board/raspberrypi2/postscript.sh index bfe0f440ae..be1e661160 100755 --- a/board/raspberrypi2/postscript.sh +++ b/board/raspberrypi2/postscript.sh @@ -14,3 +14,6 @@ cp ${RPI_FW_DIR}/bootcode.bin ${BOOT_DIR} cp ${RPI_FW_DIR}/start.elf ${BOOT_DIR} cp ${RPI_FW_DIR}/fixup.dat ${BOOT_DIR} +# copy overlays +mkdir -p ${BOOT_DIR}/overlays +cp ${RPI_FW_DIR}/overlays/*.dtbo ${BOOT_DIR}/overlays diff --git a/board/raspberrypi3/postscript.sh b/board/raspberrypi3/postscript.sh index 9469f74a7f..c8f90025a4 100755 --- a/board/raspberrypi3/postscript.sh +++ b/board/raspberrypi3/postscript.sh @@ -16,3 +16,6 @@ cp ${RPI_FW_DIR}/bootcode.bin ${BOOT_DIR} cp ${RPI_FW_DIR}/start.elf ${BOOT_DIR} cp ${RPI_FW_DIR}/fixup.dat ${BOOT_DIR} +# copy overlays +mkdir -p ${BOOT_DIR}/overlays +cp ${RPI_FW_DIR}/overlays/*.dtbo ${BOOT_DIR}/overlays diff --git a/board/raspberrypi4/postscript.sh b/board/raspberrypi4/postscript.sh index 51e630b1d8..f2572d6296 100755 --- a/board/raspberrypi4/postscript.sh +++ b/board/raspberrypi4/postscript.sh @@ -12,3 +12,7 @@ cp ${IMG_DIR}/bcm2711-rpi-4-b.dtb ${BOOT_DIR} cp ${RPI_FW_DIR}/bootcode.bin ${BOOT_DIR} cp ${RPI_FW_DIR}/start4.elf ${BOOT_DIR} cp ${RPI_FW_DIR}/fixup4.dat ${BOOT_DIR} + +# copy overlays +mkdir -p ${BOOT_DIR}/overlays +cp ${RPI_FW_DIR}/overlays/*.dtbo ${BOOT_DIR}/overlays From 949bc964b89faa4ab9b866650ddae98ec0e2c606 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 11 Sep 2019 22:51:51 +0300 Subject: [PATCH 05/16] Bluetooth absence no longer generates panic action --- board/common/overlay/etc/init.d/S37bluetooth | 15 +++++++----- .../raspberrypi/overlay/etc/init.d/S13btuart | 24 ++++++++++--------- .../raspberrypi3/overlay/etc/init.d/S13btuart | 24 ++++++++++--------- .../raspberrypi4/overlay/etc/init.d/S13btuart | 24 ++++++++++--------- 4 files changed, 48 insertions(+), 39 deletions(-) diff --git a/board/common/overlay/etc/init.d/S37bluetooth b/board/common/overlay/etc/init.d/S37bluetooth index 3d82b6dfc0..647e921e17 100755 --- a/board/common/overlay/etc/init.d/S37bluetooth +++ b/board/common/overlay/etc/init.d/S37bluetooth @@ -10,6 +10,7 @@ PROG="/usr/libexec/bluetooth/bluetoothd" PROG_HC="/usr/bin/hciconfig" DATA_DIR="/var/lib/bluetooth" RUN_DATA_DIR="/data/bluetooth" +NO_ON_BOARD_BT="/tmp/.no_on_board_bt" # used by RPi to explicitly indicate that no on-board BT was detected test -x ${PROG} || exit 0 @@ -40,14 +41,16 @@ start() { # wait up to 10 seconds for device count=0 while ! ${PROG_HC} ${ADAPTER} &>/dev/null; do - sleep 1 - count=$((${count} + 1)) - if [[ ${count} -ge 10 ]]; then + # on RPi boards, the absence of an on-board BT can be detected earlier, preventing 10s timeout + + count=$((count + 1)) + if [[ ${count} -ge 10 ]] || [[ -f "${NO_ON_BOARD_BT}" ]]; then msg_fail "no device" - logger -t bluetooth "bluetooth device not available, calling panic action" - panic_action bluetooth - return 1 + logger -t bluetooth "bluetooth device not available" + return 0 fi + + sleep 1 done if configure; then diff --git a/board/raspberrypi/overlay/etc/init.d/S13btuart b/board/raspberrypi/overlay/etc/init.d/S13btuart index 0ad4deda81..aa2d0f431e 100755 --- a/board/raspberrypi/overlay/etc/init.d/S13btuart +++ b/board/raspberrypi/overlay/etc/init.d/S13btuart @@ -3,44 +3,46 @@ SYS_CONF="/etc/bluetooth.conf" BOOT_CONF="/boot/bluetooth.conf" CONF="/data/etc/bluetooth.conf" +NO_ON_BOARD_BT="/tmp/.no_on_board_bt" # used by RPi to explicitly indicate that no on-board BT was detected test -f ${CONF} || test -f ${BOOT_CONF} || test -f ${SYS_CONF} || exit 0 -test -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" || exit 0 # no rpi bluetooth detected +if ! [ -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" ]; then + touch ${NO_ON_BOARD_BT} + exit 0 # no rpi bluetooth detected +fi test -n "${OS_VERSION}" || source /etc/init.d/base function start() { if [[ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ]] ; then - if [[ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = " 16" ]] ; then - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 3000000 flow - &>/dev/null + if [[ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ]]; then + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 3000000 flow - &>/dev/null else - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 921600 noflow - &>/dev/null + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 921600 noflow - &>/dev/null fi else - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 460800 noflow - &>/dev/null + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 460800 noflow - &>/dev/null fi } case "$1" in start) - msg_begin "Attaching UART bluetooth modem" - # for some reason, sometimes the hciattach command needs to be run twice - (start || start) &>/dev/null & + msg_begin "Attaching UART bluetooth device" + start &>/dev/null & msg_background ;; stop) - msg_begin "Detaching UART bluetooth modem" + msg_begin "Detaching UART bluetooth device" killall hciattach &>/dev/null test $? == 0 && msg_done || msg_fail ;; *) - echo $"Usage: $0 {start}" + echo $"Usage: $0 {start|stop}" exit 1 esac exit $? - diff --git a/board/raspberrypi3/overlay/etc/init.d/S13btuart b/board/raspberrypi3/overlay/etc/init.d/S13btuart index 0ad4deda81..aa2d0f431e 100755 --- a/board/raspberrypi3/overlay/etc/init.d/S13btuart +++ b/board/raspberrypi3/overlay/etc/init.d/S13btuart @@ -3,44 +3,46 @@ SYS_CONF="/etc/bluetooth.conf" BOOT_CONF="/boot/bluetooth.conf" CONF="/data/etc/bluetooth.conf" +NO_ON_BOARD_BT="/tmp/.no_on_board_bt" # used by RPi to explicitly indicate that no on-board BT was detected test -f ${CONF} || test -f ${BOOT_CONF} || test -f ${SYS_CONF} || exit 0 -test -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" || exit 0 # no rpi bluetooth detected +if ! [ -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" ]; then + touch ${NO_ON_BOARD_BT} + exit 0 # no rpi bluetooth detected +fi test -n "${OS_VERSION}" || source /etc/init.d/base function start() { if [[ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ]] ; then - if [[ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = " 16" ]] ; then - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 3000000 flow - &>/dev/null + if [[ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ]]; then + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 3000000 flow - &>/dev/null else - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 921600 noflow - &>/dev/null + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 921600 noflow - &>/dev/null fi else - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 460800 noflow - &>/dev/null + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 460800 noflow - &>/dev/null fi } case "$1" in start) - msg_begin "Attaching UART bluetooth modem" - # for some reason, sometimes the hciattach command needs to be run twice - (start || start) &>/dev/null & + msg_begin "Attaching UART bluetooth device" + start &>/dev/null & msg_background ;; stop) - msg_begin "Detaching UART bluetooth modem" + msg_begin "Detaching UART bluetooth device" killall hciattach &>/dev/null test $? == 0 && msg_done || msg_fail ;; *) - echo $"Usage: $0 {start}" + echo $"Usage: $0 {start|stop}" exit 1 esac exit $? - diff --git a/board/raspberrypi4/overlay/etc/init.d/S13btuart b/board/raspberrypi4/overlay/etc/init.d/S13btuart index 0ad4deda81..aa2d0f431e 100755 --- a/board/raspberrypi4/overlay/etc/init.d/S13btuart +++ b/board/raspberrypi4/overlay/etc/init.d/S13btuart @@ -3,44 +3,46 @@ SYS_CONF="/etc/bluetooth.conf" BOOT_CONF="/boot/bluetooth.conf" CONF="/data/etc/bluetooth.conf" +NO_ON_BOARD_BT="/tmp/.no_on_board_bt" # used by RPi to explicitly indicate that no on-board BT was detected test -f ${CONF} || test -f ${BOOT_CONF} || test -f ${SYS_CONF} || exit 0 -test -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" || exit 0 # no rpi bluetooth detected +if ! [ -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" ]; then + touch ${NO_ON_BOARD_BT} + exit 0 # no rpi bluetooth detected +fi test -n "${OS_VERSION}" || source /etc/init.d/base function start() { if [[ "$(cat /proc/device-tree/aliases/uart0)" = "$(cat /proc/device-tree/aliases/serial1)" ]] ; then - if [[ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = " 16" ]] ; then - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 3000000 flow - &>/dev/null + if [[ "$(wc -c /proc/device-tree/soc/gpio@7e200000/uart0_pins/brcm\,pins | cut -f 1 -d ' ')" = "16" ]]; then + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 3000000 flow - &>/dev/null else - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 921600 noflow - &>/dev/null + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 921600 noflow - &>/dev/null fi else - /usr/bin/hciattach -t5 /dev/serial1 bcm43xx 460800 noflow - &>/dev/null + /usr/bin/hciattach -t 10 /dev/serial1 bcm43xx 460800 noflow - &>/dev/null fi } case "$1" in start) - msg_begin "Attaching UART bluetooth modem" - # for some reason, sometimes the hciattach command needs to be run twice - (start || start) &>/dev/null & + msg_begin "Attaching UART bluetooth device" + start &>/dev/null & msg_background ;; stop) - msg_begin "Detaching UART bluetooth modem" + msg_begin "Detaching UART bluetooth device" killall hciattach &>/dev/null test $? == 0 && msg_done || msg_fail ;; *) - echo $"Usage: $0 {start}" + echo $"Usage: $0 {start|stop}" exit 1 esac exit $? - From 77414ccb7779c5b6cd86fe38ebf1af924574a7c4 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 11 Sep 2019 23:16:18 +0300 Subject: [PATCH 06/16] Raspberry Pi (all): add S07dtoverlays init script --- .../overlay/etc/init.d/S07dtoverlays | 41 +++++++++++++++++++ .../overlay/etc/init.d/S07dtoverlays | 41 +++++++++++++++++++ .../overlay/etc/init.d/S07dtoverlays | 41 +++++++++++++++++++ .../overlay/etc/init.d/S07dtoverlays | 41 +++++++++++++++++++ 4 files changed, 164 insertions(+) create mode 100755 board/raspberrypi/overlay/etc/init.d/S07dtoverlays create mode 100755 board/raspberrypi2/overlay/etc/init.d/S07dtoverlays create mode 100755 board/raspberrypi3/overlay/etc/init.d/S07dtoverlays create mode 100755 board/raspberrypi4/overlay/etc/init.d/S07dtoverlays diff --git a/board/raspberrypi/overlay/etc/init.d/S07dtoverlays b/board/raspberrypi/overlay/etc/init.d/S07dtoverlays new file mode 100755 index 0000000000..9b67103d53 --- /dev/null +++ b/board/raspberrypi/overlay/etc/init.d/S07dtoverlays @@ -0,0 +1,41 @@ +#!/bin/bash + +SYS_DTOVERLAYS_FILE="/etc/dtoverlays" +BOOT_DTOVERLAYS_FILE="/boot/dtoverlays" +DTOVERLAYS_FILE="/data/etc/dtoverlays" + +PROG="/usr/bin/dtoverlay" + + +test -n "${OS_VERSION}" || source /etc/init.d/base + +case "$1" in + start) + msg_begin "Loading device-tree overlays" + + if [[ -r ${SYS_DTOVERLAYS_FILE} ]]; then + cat ${SYS_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${BOOT_DTOVERLAYS_FILE} ]]; then + cat ${BOOT_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${DTOVERLAYS_FILE} ]]; then + cat ${DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + msg_done + ;; + + stop) + true + ;; + + *) + echo "Usage: $0 {start}" + exit 1 +esac + +exit $? + diff --git a/board/raspberrypi2/overlay/etc/init.d/S07dtoverlays b/board/raspberrypi2/overlay/etc/init.d/S07dtoverlays new file mode 100755 index 0000000000..9b67103d53 --- /dev/null +++ b/board/raspberrypi2/overlay/etc/init.d/S07dtoverlays @@ -0,0 +1,41 @@ +#!/bin/bash + +SYS_DTOVERLAYS_FILE="/etc/dtoverlays" +BOOT_DTOVERLAYS_FILE="/boot/dtoverlays" +DTOVERLAYS_FILE="/data/etc/dtoverlays" + +PROG="/usr/bin/dtoverlay" + + +test -n "${OS_VERSION}" || source /etc/init.d/base + +case "$1" in + start) + msg_begin "Loading device-tree overlays" + + if [[ -r ${SYS_DTOVERLAYS_FILE} ]]; then + cat ${SYS_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${BOOT_DTOVERLAYS_FILE} ]]; then + cat ${BOOT_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${DTOVERLAYS_FILE} ]]; then + cat ${DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + msg_done + ;; + + stop) + true + ;; + + *) + echo "Usage: $0 {start}" + exit 1 +esac + +exit $? + diff --git a/board/raspberrypi3/overlay/etc/init.d/S07dtoverlays b/board/raspberrypi3/overlay/etc/init.d/S07dtoverlays new file mode 100755 index 0000000000..9b67103d53 --- /dev/null +++ b/board/raspberrypi3/overlay/etc/init.d/S07dtoverlays @@ -0,0 +1,41 @@ +#!/bin/bash + +SYS_DTOVERLAYS_FILE="/etc/dtoverlays" +BOOT_DTOVERLAYS_FILE="/boot/dtoverlays" +DTOVERLAYS_FILE="/data/etc/dtoverlays" + +PROG="/usr/bin/dtoverlay" + + +test -n "${OS_VERSION}" || source /etc/init.d/base + +case "$1" in + start) + msg_begin "Loading device-tree overlays" + + if [[ -r ${SYS_DTOVERLAYS_FILE} ]]; then + cat ${SYS_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${BOOT_DTOVERLAYS_FILE} ]]; then + cat ${BOOT_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${DTOVERLAYS_FILE} ]]; then + cat ${DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + msg_done + ;; + + stop) + true + ;; + + *) + echo "Usage: $0 {start}" + exit 1 +esac + +exit $? + diff --git a/board/raspberrypi4/overlay/etc/init.d/S07dtoverlays b/board/raspberrypi4/overlay/etc/init.d/S07dtoverlays new file mode 100755 index 0000000000..9b67103d53 --- /dev/null +++ b/board/raspberrypi4/overlay/etc/init.d/S07dtoverlays @@ -0,0 +1,41 @@ +#!/bin/bash + +SYS_DTOVERLAYS_FILE="/etc/dtoverlays" +BOOT_DTOVERLAYS_FILE="/boot/dtoverlays" +DTOVERLAYS_FILE="/data/etc/dtoverlays" + +PROG="/usr/bin/dtoverlay" + + +test -n "${OS_VERSION}" || source /etc/init.d/base + +case "$1" in + start) + msg_begin "Loading device-tree overlays" + + if [[ -r ${SYS_DTOVERLAYS_FILE} ]]; then + cat ${SYS_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${BOOT_DTOVERLAYS_FILE} ]]; then + cat ${BOOT_DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + if [[ -r ${DTOVERLAYS_FILE} ]]; then + cat ${DTOVERLAYS_FILE} | while read line; do test -n "${line}" && ${PROG} ${line}; done + fi + + msg_done + ;; + + stop) + true + ;; + + *) + echo "Usage: $0 {start}" + exit 1 +esac + +exit $? + From a540419e65ccdf80b577218571abbe36e0d9ac82 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 11 Sep 2019 23:20:19 +0300 Subject: [PATCH 07/16] Raspberry Pi (all): remove dtoverlay-{pre,post} --- board/raspberrypi/cleanups.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/raspberrypi/cleanups.sh b/board/raspberrypi/cleanups.sh index 81f8694b8a..f2ae096b4c 100755 --- a/board/raspberrypi/cleanups.sh +++ b/board/raspberrypi/cleanups.sh @@ -2,4 +2,4 @@ rm -rf ${TARGET}/opt/vc/src rm -rf ${TARGET}/opt/vc/include - +rm -rf ${TARGET}/usr/bin/dtoverlay-{pre,post} From 969a6bf98046f291026730481b99956fd0a682fb Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 12 Sep 2019 21:47:11 +0300 Subject: [PATCH 08/16] cleanups.sh: avoid using curly brackets expansion --- board/raspberrypi/cleanups.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/raspberrypi/cleanups.sh b/board/raspberrypi/cleanups.sh index f2ae096b4c..23ad8b8387 100755 --- a/board/raspberrypi/cleanups.sh +++ b/board/raspberrypi/cleanups.sh @@ -2,4 +2,4 @@ rm -rf ${TARGET}/opt/vc/src rm -rf ${TARGET}/opt/vc/include -rm -rf ${TARGET}/usr/bin/dtoverlay-{pre,post} +rm -rf ${TARGET}/usr/bin/dtoverlay-* From fd12ec83cb75f1c95d234f047d5629681249c160 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Thu, 12 Sep 2019 21:55:32 +0300 Subject: [PATCH 09/16] Raspberry Pi (all): S13btuart: exit on empty bluetooth.conf --- board/raspberrypi/overlay/etc/init.d/S13btuart | 4 ++++ board/raspberrypi3/overlay/etc/init.d/S13btuart | 4 ++++ board/raspberrypi4/overlay/etc/init.d/S13btuart | 4 ++++ 3 files changed, 12 insertions(+) diff --git a/board/raspberrypi/overlay/etc/init.d/S13btuart b/board/raspberrypi/overlay/etc/init.d/S13btuart index aa2d0f431e..d0090f6612 100755 --- a/board/raspberrypi/overlay/etc/init.d/S13btuart +++ b/board/raspberrypi/overlay/etc/init.d/S13btuart @@ -13,6 +13,10 @@ if ! [ -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" ]; then exit 0 # no rpi bluetooth detected fi +if [[ -f ${CONF} ]] && ! [[ -s ${CONF} ]]; then + exit 0 # bluetooth explicitly disabled by empty bluetooth.conf +fi + test -n "${OS_VERSION}" || source /etc/init.d/base function start() { diff --git a/board/raspberrypi3/overlay/etc/init.d/S13btuart b/board/raspberrypi3/overlay/etc/init.d/S13btuart index aa2d0f431e..d0090f6612 100755 --- a/board/raspberrypi3/overlay/etc/init.d/S13btuart +++ b/board/raspberrypi3/overlay/etc/init.d/S13btuart @@ -13,6 +13,10 @@ if ! [ -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" ]; then exit 0 # no rpi bluetooth detected fi +if [[ -f ${CONF} ]] && ! [[ -s ${CONF} ]]; then + exit 0 # bluetooth explicitly disabled by empty bluetooth.conf +fi + test -n "${OS_VERSION}" || source /etc/init.d/base function start() { diff --git a/board/raspberrypi4/overlay/etc/init.d/S13btuart b/board/raspberrypi4/overlay/etc/init.d/S13btuart index aa2d0f431e..d0090f6612 100755 --- a/board/raspberrypi4/overlay/etc/init.d/S13btuart +++ b/board/raspberrypi4/overlay/etc/init.d/S13btuart @@ -13,6 +13,10 @@ if ! [ -d "/proc/device-tree/soc/gpio@7e200000/uart0_pins" ]; then exit 0 # no rpi bluetooth detected fi +if [[ -f ${CONF} ]] && ! [[ -s ${CONF} ]]; then + exit 0 # bluetooth explicitly disabled by empty bluetooth.conf +fi + test -n "${OS_VERSION}" || source /etc/init.d/base function start() { From 00d7e58e893bdc78b618682680093b9504c2b4e5 Mon Sep 17 00:00:00 2001 From: popoviciri Date: Fri, 27 Sep 2019 06:58:17 +0200 Subject: [PATCH 10/16] linux 4.19.75 - not the latest stable but previous 4.19.71 includes the 10th in v4l2 driver; see https://github.com/raspberrypi/linux/pull/3212 --- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 2d4386067b..b674ea4a29 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi2/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6d8bf28fa4b1ca0a35c0cd1dcb267fb216daf720.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b" diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index a684cd99d0..05ee944b52 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi3/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6d8bf28fa4b1ca0a35c0cd1dcb267fb216daf720.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2709" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3" diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 726bde64a2..de667fd2a1 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -12,7 +12,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi4/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6d8bf28fa4b1ca0a35c0cd1dcb267fb216daf720.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcm2711" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2711-rpi-4-b" diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 9c0035a619..a495d2ca6f 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -19,7 +19,7 @@ BR2_ROOTFS_OVERLAY="board/common/overlay board/raspberrypi/overlay" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/0b3be176533d99ffd13dc0a95793edbb67a1c238.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/6d8bf28fa4b1ca0a35c0cd1dcb267fb216daf720.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-zero-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm" From dea9dc9a54e1701aa6d4e8860ec00e3f5ea66336 Mon Sep 17 00:00:00 2001 From: popoviciri Date: Fri, 27 Sep 2019 07:08:27 +0200 Subject: [PATCH 11/16] kernel 4.19.75 --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index d346fbd24d..98e17bf1de 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1 +1 @@ -sha256 b3a8bd532ca38f90e322be9fe4858a974e04ba8254248e416bf9e9ec5f176d95 rpi-firmware-66bafab005569e3eb92ec54cd3efeee3da338738.tar.gz +sha256 388dd784a4c9a9fcdbf777c54e9cb5fae70a0e7666a137153ac23f459ad113b6 rpi-firmware-f5c626c64874d6e1482edf4a76aa22e5e54be63d.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 465d606b91..2b4dcac8d6 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = 66bafab005569e3eb92ec54cd3efeee3da338738 +RPI_FIRMWARE_VERSION = f5c626c64874d6e1482edf4a76aa22e5e54be63d RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom From 0174585166de248a2e6d699fa4f4b98fa010f635 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 28 Sep 2019 23:30:01 +0300 Subject: [PATCH 12/16] S50date: prevent caching when using http method --- board/common/overlay/etc/init.d/S50date | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index b8de6a29c3..5ffd429fec 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -32,7 +32,9 @@ 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: //') + curl_args="-v -s -m ${DATE_TIMEOUT} -H \"Cache-Control: no-cache\" -X GET" + url="http://${DATE_HOST}?_=${RANDOM}" + date_str=$(curl ${curl_args} ${url} 2>&1 | grep Date | sed -e 's/< Date: //') if [[ -n "${date_str}" ]]; then ${PROG_DATE} -u -D "%a, %d %b %Y %H:%M:%S" -s "${date_str}" > /dev/null logger -t date "current system date/time set to $(date) via HTTP" @@ -101,7 +103,7 @@ start_ntp() { stop_http() { msg_begin "Stopping date updater" - ps | grep S60date | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill + ps | grep S50date | grep -v $$ | grep -v grep | tr -s ' ' | sed -e 's/^\s//' | cut -d ' ' -f 1 | xargs -r kill test $? == 0 && msg_done || msg_fail } From bbc21276af068791cb32e0501a95ab3d4f45d800 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sat, 28 Sep 2019 23:35:46 +0300 Subject: [PATCH 13/16] S50date: use ntpd -gq instead of ntpdate --- board/common/overlay/etc/init.d/S50date | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index 5ffd429fec..09622bcb73 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -2,7 +2,6 @@ PROG_DATE="/bin/date" PROG_NTPD="/usr/sbin/ntpd" -PROG_NTPDATE="/usr/bin/ntpdate" SYS_CONF="/etc/date.conf" BOOT_CONF="/boot/date.conf" @@ -46,7 +45,7 @@ set_current_date_http() { } set_current_date_ntp() { - cat ${NTP_CONF} | grep server | head -n 1 | cut -d ' ' -f 2 | xargs ${PROG_NTPDATE} -t ${DATE_TIMEOUT} -s + ${PROG_NTPD} -gq &>/dev/null if [[ $? == 0 ]]; then logger -t date "current system date/time set to $(date) via NTP" return 0 From 09a2cf3aab5791ce357ebebd2b2325253802d30e Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 29 Sep 2019 11:25:17 +0300 Subject: [PATCH 14/16] Add SNTP support --- board/common/overlay/etc/init.d/S50date | 36 ++++++++++++++++++++----- configs/bananapim1_defconfig | 2 +- configs/nanopineo2_defconfig | 2 +- configs/nanopineo_defconfig | 2 +- configs/odroidc1_defconfig | 2 +- configs/odroidc2_defconfig | 2 +- configs/odroidxu4_defconfig | 2 +- configs/orangepione_defconfig | 2 +- configs/orangepizero_defconfig | 2 +- configs/pine64_defconfig | 2 +- configs/raspberrypi2_defconfig | 2 +- configs/raspberrypi3_defconfig | 2 +- configs/raspberrypi4_defconfig | 2 +- configs/raspberrypi_defconfig | 2 +- configs/tinkerboard_defconfig | 2 +- 15 files changed, 43 insertions(+), 21 deletions(-) diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index 09622bcb73..0f3c39ec98 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -2,6 +2,8 @@ PROG_DATE="/bin/date" PROG_NTPD="/usr/sbin/ntpd" +PROG_SNTP="/usr/bin/sntp" +LOG_SNTP="/var/log/sntp.log" SYS_CONF="/etc/date.conf" BOOT_CONF="/boot/date.conf" @@ -55,8 +57,22 @@ set_current_date_ntp() { fi } +set_current_date_sntp() { + sntp_args="-t ${DATE_TIMEOUT} -K /var/lib/ntp/kod -Ss" + server=$(cat ${NTP_CONF} | grep server | head -n 1 | cut -d ' ' -f 2) + ${PROG_SNTP} ${sntp_args} ${server} &>${LOG_SNTP} + if [[ $? == 0 ]]; then + logger -t date "current system date/time set to $(date) via SNTP" + return 0 + else + logger -t date "failed to set current system date/time via SNTP" + return 1 + fi +} + + start_http() { - msg_begin "Setting current date using http" + msg_begin "Setting current date using HTTP" if set_current_date_http; then sleep_interval=${DATE_INTERVAL} msg_done "$(${PROG_DATE})" @@ -79,6 +95,7 @@ start_http() { start_ntp() { mkdir -p /var/lib/ntp + touch /var/lib/ntp/kod cat ${NTP_CONF} | grep -v iburst > ${NTP_CONF}.tmp @@ -91,9 +108,15 @@ start_ntp() { cat ${NTP_CONF}.tmp >> ${NTP_CONF} rm ${NTP_CONF}.tmp - msg_begin "Setting current date using ntp" - set_current_date_ntp || set_current_date_ntp - test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail + if [[ "${DATE_METHOD}" == "sntp" ]]; then + msg_begin "Setting current date using SNTP" + set_current_date_sntp + test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail + else # assuming ntp + msg_begin "Setting current date using NTP" + set_current_date_ntp || set_current_date_ntp + test $? == 0 && msg_done "$(${PROG_DATE})" || msg_fail + fi msg_begin "Starting ntpd" ${PROG_NTPD} -g -c ${NTP_CONF} @@ -115,7 +138,7 @@ stop_ntp() { start() { if [[ "${DATE_METHOD}" == "http" ]]; then start_http - else + else # ntp or sntp start_ntp fi @@ -125,7 +148,7 @@ start() { stop() { if [[ "${DATE_METHOD}" == "http" ]]; then stop_http - else + else # ntp or sntp stop_ntp fi } @@ -150,4 +173,3 @@ case "$1" in esac exit $? - diff --git a/configs/bananapim1_defconfig b/configs/bananapim1_defconfig index 4154cf46c3..3e29136041 100644 --- a/configs/bananapim1_defconfig +++ b/configs/bananapim1_defconfig @@ -66,7 +66,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/nanopineo2_defconfig b/configs/nanopineo2_defconfig index 462c2e8f27..b117b6ff0b 100644 --- a/configs/nanopineo2_defconfig +++ b/configs/nanopineo2_defconfig @@ -58,7 +58,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/nanopineo_defconfig b/configs/nanopineo_defconfig index 7d58899a54..d3bf640f70 100644 --- a/configs/nanopineo_defconfig +++ b/configs/nanopineo_defconfig @@ -58,7 +58,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig index 3b316a3fbd..f5b70a4981 100644 --- a/configs/odroidc1_defconfig +++ b/configs/odroidc1_defconfig @@ -70,7 +70,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index b8063ae49e..203ac0cc42 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -58,7 +58,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig index 520e2d3990..6f3808b498 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -60,7 +60,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/orangepione_defconfig b/configs/orangepione_defconfig index 3a04203378..24ea3e86eb 100644 --- a/configs/orangepione_defconfig +++ b/configs/orangepione_defconfig @@ -61,7 +61,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/orangepizero_defconfig b/configs/orangepizero_defconfig index de5438142c..94ccba49dd 100644 --- a/configs/orangepizero_defconfig +++ b/configs/orangepizero_defconfig @@ -61,7 +61,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index 3d2ec79786..bb394ba838 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -57,7 +57,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 2d4386067b..1c43b55e65 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -64,7 +64,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index a684cd99d0..04be7e51ef 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -64,7 +64,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/raspberrypi4_defconfig b/configs/raspberrypi4_defconfig index 726bde64a2..dbfafe7770 100644 --- a/configs/raspberrypi4_defconfig +++ b/configs/raspberrypi4_defconfig @@ -64,7 +64,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 9c0035a619..45f0885a34 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -71,7 +71,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y diff --git a/configs/tinkerboard_defconfig b/configs/tinkerboard_defconfig index f6fb99c707..c2bf2c966d 100644 --- a/configs/tinkerboard_defconfig +++ b/configs/tinkerboard_defconfig @@ -61,7 +61,7 @@ BR2_PACKAGE_IW=y BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NET_TOOLS=y BR2_PACKAGE_NTP=y -BR2_PACKAGE_NTP_NTPDATE=y +BR2_PACKAGE_NTP_SNTP=y BR2_PACKAGE_OPENSSH=y BR2_PACKAGE_PPPD=y BR2_PACKAGE_WIRELESS_TOOLS=y From e9d6acc679ec970d9587c9f92e4056fd7eb767f8 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Sun, 29 Sep 2019 11:26:28 +0300 Subject: [PATCH 15/16] S50date: set default date method to sntp --- board/common/overlay/etc/init.d/S50date | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/common/overlay/etc/init.d/S50date b/board/common/overlay/etc/init.d/S50date index 0f3c39ec98..ec434993d6 100755 --- a/board/common/overlay/etc/init.d/S50date +++ b/board/common/overlay/etc/init.d/S50date @@ -24,7 +24,7 @@ test -s ${CONF} || exit 0 test "${OS_NETWORKLESS}" == "true" && exit 0 DATE_TIMEOUT=10 -DATE_METHOD=http +DATE_METHOD=sntp DATE_HOST="google.com" DATE_INTERVAL="900" DATE_NTP_SERVER="" From eba78c122d2a1f28de5e8d52da225523043d252f Mon Sep 17 00:00:00 2001 From: popoviciri Date: Sun, 29 Sep 2019 12:20:51 +0200 Subject: [PATCH 16/16] correct firmware from stable branch --- package/rpi-firmware/rpi-firmware.hash | 2 +- package/rpi-firmware/rpi-firmware.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/rpi-firmware/rpi-firmware.hash b/package/rpi-firmware/rpi-firmware.hash index 98e17bf1de..713f912eb8 100644 --- a/package/rpi-firmware/rpi-firmware.hash +++ b/package/rpi-firmware/rpi-firmware.hash @@ -1 +1 @@ -sha256 388dd784a4c9a9fcdbf777c54e9cb5fae70a0e7666a137153ac23f459ad113b6 rpi-firmware-f5c626c64874d6e1482edf4a76aa22e5e54be63d.tar.gz +sha256 eec0287caa24b42d5460ed7c555e6871096ee7cfddd1582bf864930740095de1 rpi-firmware-01508e81ec1e918448227ca864616d56c430b46d.tar.gz diff --git a/package/rpi-firmware/rpi-firmware.mk b/package/rpi-firmware/rpi-firmware.mk index 2b4dcac8d6..ddb977676d 100644 --- a/package/rpi-firmware/rpi-firmware.mk +++ b/package/rpi-firmware/rpi-firmware.mk @@ -4,7 +4,7 @@ # ################################################################################ -RPI_FIRMWARE_VERSION = f5c626c64874d6e1482edf4a76aa22e5e54be63d +RPI_FIRMWARE_VERSION = 01508e81ec1e918448227ca864616d56c430b46d RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION)) RPI_FIRMWARE_LICENSE = BSD-3-Clause RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom