jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-04-19 12:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'thingos/dev' into dev

Browse Source
This commit is contained in:
Calin Crisan 2019-01-13 23:08:50 +02:00
commit ca0a8300dd
7 changed files with 43 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board/common/overlay/etc/init.d/S35wifi
View File

@ -22,10 +22,17 @@ fi
source $watch_conf
if [[ -f $boot_conf ]]; then
cp -f $boot_conf $conf
grep -E "/boot .*ro[\s,]" /proc/mounts
RO=$?
test $RO == 0 && mount -o remount,rw /boot
rm -f $boot_conf
test $RO == 0 && mount -o remount,ro /boot
fi
if ! [[ -f $conf ]]; then
if [[ -f $boot_conf ]]; then
cp $boot_conf $conf
elif [[ -f $sys_conf ]]; then
if [[ -f $sys_conf ]]; then
cp $sys_conf $conf
fi
fi

41
board/common/overlay/sbin/fwupdate
View File

@ -4,14 +4,14 @@
#### usage ####
function exit_usage() {
echo "Usage: fwupdate versions [-j] (lists available versions, optionally outputting json)"
echo " fwupdate current (shows the current version"
echo " fwupdate download <version|url> (downloads a firmware version)"
echo " fwupdate extract (extracts the downloaded firmware archive)"
echo " fwupdate flashboot (flashes the boot partition from extracted image)"
echo " fwupdate flashreboot (prepares for reboot + root partititon flash)"
echo " fwupdate status (shows the current firmware updating status; see below)"
echo " fwupdate upgrade <version|url> (performs all the operations necessary for upgrading)"
echo "Usage: fwupdate versions [-j] (lists available versions, optionally outputting json)"
echo " fwupdate current (shows the current version"
echo " fwupdate download <version|url|file> (downloads a firmware version)"
echo " fwupdate extract (extracts the downloaded firmware archive)"
echo " fwupdate flashboot (flashes the boot partition from extracted image)"
echo " fwupdate flashreboot (prepares for reboot + root partititon flash)"
echo " fwupdate status (shows the current firmware updating status; see below)"
echo " fwupdate upgrade <version|url|file> (performs all the operations necessary for upgrading)"
echo ""
echo "Statuses:"
echo " idle"
@ -123,9 +123,26 @@ function show_current() {
function do_download() {
echo "downloading..."
rm -f $FW_DIR/$FW_FILE_GZ $FW_DIR/$FW_FILE_XZ
rm -f $FW_DIR/$FW_FILE_EXTR
rm -f $FW_DIR/$BOOT_READY_FILE
rm -rf $FW_DIR/*
mkdir -p $FW_DIR
# Look for local file first
if [ -f "$1" ]; then
version="custom"
FNAME=`basename $1`
FILEEXT=${FNAME##*.}
DST_FNAME=""
if [ "$FILEEXT" == "xz" ]; then
DST_FNAME="$FW_DIR/$FW_FILE_XZ"
elif [ "$FILEEXT" == "gz" ]; then
DST_FNAME="$FW_DIR/$FW_FILE_GZ"
fi
if [ -n "$DST_FNAME" ]; then
cp -f $1 $DST_FNAME
echo $version > $FW_DIR/$VER_FILE
return
fi
fi
source $OS_CONF
board=$(cat $SYS_BOARD_FILE)
@ -155,8 +172,6 @@ function do_download() {
outfile=$FW_DIR/$FW_FILE_XZ
fi
rm -rf $FW_DIR/*
mkdir -p $FW_DIR
echo $version > $FW_DIR/$VER_FILE
curl_opts="-S -f -L"

2
configs/raspberrypi2_defconfig
View File

@ -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/4f30a5365296658d66ef8a9f878a25d229e2d5fa.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/36612d5d7a88672a3e7dd6cb458dbbbca0d75efe.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"

2
configs/raspberrypi3_defconfig
View File

@ -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/4f30a5365296658d66ef8a9f878a25d229e2d5fa.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/36612d5d7a88672a3e7dd6cb458dbbbca0d75efe.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"

2
configs/raspberrypi_defconfig
View File

@ -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/4f30a5365296658d66ef8a9f878a25d229e2d5fa.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/36612d5d7a88672a3e7dd6cb458dbbbca0d75efe.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcmrpi"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2708-rpi-0-w bcm2708-rpi-b bcm2708-rpi-b-plus bcm2708-rpi-cm"

2
package/rpi-firmware/rpi-firmware.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RPI_FIRMWARE_VERSION = 5b49caa17e91d0e64024380119ad739bb201c674
RPI_FIRMWARE_VERSION = 12e0bf86e08d6067372bc0a45d7e8a10d3113210
RPI_FIRMWARE_SITE = $(call github,raspberrypi,firmware,$(RPI_FIRMWARE_VERSION))
RPI_FIRMWARE_LICENSE = BSD-3-Clause
RPI_FIRMWARE_LICENSE_FILES = boot/LICENCE.broadcom

2
package/rpi-userland/rpi-userland.mk
View File

@ -4,7 +4,7 @@
#
################################################################################
RPI_USERLAND_VERSION = d574b51a60a075baefe863670466ee24e6c4256e
RPI_USERLAND_VERSION = 6da49bce07d8061165e7fa9036af5fd9ae060221
RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
RPI_USERLAND_LICENSE = BSD-3-Clause
RPI_USERLAND_LICENSE_FILES = LICENCE