jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 05:36:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thingos' into dev

Browse Source
This commit is contained in:
Calin Crisan 2018-02-09 15:56:30 +02:00
commit 39d647b60c
2 changed files with 47 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,8 @@ ROOT_INFO_FILE=root_info
BOOT_READY_FILE=boot_flash_ready BOOT_READY_FILE=boot_flash_ready
FW_DIR=/data/.fwupdate FW_DIR=/data/.fwupdate
FW_FILE=firmware.img.gz FW_FILE_GZ=firmware.img.gz
FW_FILE_XZ=firmware.img.xz
FW_FILE_EXTR=firmware.img FW_FILE_EXTR=firmware.img
CURL_LOG_FILE=curl.log CURL_LOG_FILE=curl.log
@ -53,6 +54,9 @@ CURL_PID_FILE=curl.pid
GUNZIP_LOG_FILE=gunzip.log GUNZIP_LOG_FILE=gunzip.log
GUNZIP_PID_FILE=gunzip.pid GUNZIP_PID_FILE=gunzip.pid
XZCAT_LOG_FILE=xzcat.log
XZCAT_PID_FILE=xzcat.pid
DD_LOG_FILE=dd.log DD_LOG_FILE=dd.log
DD_PID_FILE=dd.pid DD_PID_FILE=dd.pid
@ -101,7 +105,7 @@ function show_current() {
function do_download() { function do_download() {
echo "downloading..." echo "downloading..."
rm -f $FW_DIR/$FW_FILE rm -f $FW_DIR/$FW_FILE_GZ $FW_DIR/$FW_FILE_XZ
rm -f $FW_DIR/$FW_FILE_EXTR rm -f $FW_DIR/$FW_FILE_EXTR
rm -f $FW_DIR/$BOOT_READY_FILE rm -f $FW_DIR/$BOOT_READY_FILE
@ -111,7 +115,7 @@ function do_download() {
version=$1 version=$1
if ! [[ "$url" == http* ]]; then # a version was given if ! [[ "$url" == http* ]]; then # a version was given
url=$(show_versions true | grep "^$1" | cut -d ' ' -f 2) url=$(show_versions true | sed -rn '/^'"$version"' http.*\.img\.[a-z]+$/ {; /.*\.xz$/ {;s/^'"$version"' (.*)/\1/ p;q;}; /.*\.gz$/ {;h;b finish;};}; :finish; $ {;x;s/^'"$version"' (.*)/\1/ p;}')
else else
version="custom" version="custom"
fi fi
@ -127,6 +131,12 @@ function do_download() {
exit 1 exit 1
fi fi
outfile=$FW_DIR/$FW_FILE_GZ
format=$(echo $url | sed -rn 's/.*\.img\.([a-z]+)$/\1/ p')
if [ "$format" == "xz" ]; then
outfile=$FW_DIR/$FW_FILE_XZ
fi
rm -rf $FW_DIR/* rm -rf $FW_DIR/*
mkdir -p $FW_DIR mkdir -p $FW_DIR
echo $version > $FW_DIR/$VER_FILE echo $version > $FW_DIR/$VER_FILE
@ -136,7 +146,7 @@ function do_download() {
curl_opts+=" --user $os_firmware_username:$os_firmware_password" curl_opts+=" --user $os_firmware_username:$os_firmware_password"
fi fi
curl $curl_opts -o $FW_DIR/$FW_FILE "$url" &> $FW_DIR/$CURL_LOG_FILE & curl $curl_opts -o $outfile "$url" &> $FW_DIR/$CURL_LOG_FILE &
pid=$! pid=$!
echo $pid > $FW_DIR/$CURL_PID_FILE echo $pid > $FW_DIR/$CURL_PID_FILE
wait $pid wait $pid
@ -151,7 +161,7 @@ function download_status() {
fi fi
fi fi
if [ -f $FW_DIR/$FW_FILE ]; then if [ -f $FW_DIR/$FW_FILE_GZ -o -f $FW_DIR/$FW_FILE_XZ ]; then
echo "done" echo "done"
fi fi
} }
@ -165,23 +175,46 @@ function do_extract() {
rm -f $FW_DIR/$FW_FILE_EXTR rm -f $FW_DIR/$FW_FILE_EXTR
rm -f $FW_DIR/$BOOT_READY_FILE rm -f $FW_DIR/$BOOT_READY_FILE
if ! [ -f $FW_DIR/$FW_FILE ]; then if ! [ -f $FW_DIR/$FW_FILE_GZ -o -f $FW_DIR/$FW_FILE_XZ ]; then
echo "firmware file not downloaded" 1>&2 echo "firmware file not downloaded" 1>&2
exit 1 exit 1
fi fi
rm -f $FW_DIR/$FW_FILE_EXTR format="gz"
if [ -f $FW_DIR/$FW_FILE_XZ ]; then
format="xz"
fi
gunzip -k -c $FW_DIR/$FW_FILE > $FW_DIR/$FW_FILE_EXTR 2>$FW_DIR/$GUNZIP_LOG_FILE & rm -f $FW_DIR/$FW_FILE_EXTR
rm -f $FW_DIR/$GUNZIP_PID_FILE $FW_DIR/$XZCAT_PID_FILE
if [ "$format" == "xz" ]; then
xzcat $FW_DIR/$FW_FILE_XZ > $FW_DIR/$FW_FILE_EXTR 2>$FW_DIR/$XZCAT_LOG_FILE &
elif [ "$format" == "gz" ]; then
gunzip -k -c $FW_DIR/$FW_FILE_GZ > $FW_DIR/$FW_FILE_EXTR 2>$FW_DIR/$GUNZIP_LOG_FILE &
else
echo "firmware compression format $format not supported" 1>&2
exit 1
fi
pid=$! pid=$!
echo $pid > $FW_DIR/$GUNZIP_PID_FILE if [ "$format" == "xz" ]; then
echo $pid > $FW_DIR/$XZCAT_PID_FILE
elif [ "$format" == "gz" ]; then
echo $pid > $FW_DIR/$GUNZIP_PID_FILE
fi
wait $pid wait $pid
# TODO verify hash # TODO verify hash
} }
function extract_status() { function extract_status() {
if [ -f $FW_DIR/$GUNZIP_PID_FILE ]; then if [ -f $FW_DIR/$XZCAT_PID_FILE ]; then
pid=$(cat $FW_DIR/$XZCAT_PID_FILE)
if kill -0 $pid &>/dev/null; then
echo "running"
return
fi
elif [ -f $FW_DIR/$GUNZIP_PID_FILE ]; then
pid=$(cat $FW_DIR/$GUNZIP_PID_FILE) pid=$(cat $FW_DIR/$GUNZIP_PID_FILE)
if kill -0 $pid &>/dev/null; then if kill -0 $pid &>/dev/null; then
echo "running" echo "running"

5
build.sh
View File

@ -46,9 +46,12 @@ elif [ "$target" == "mkrelease" ]; then
$boarddir/mkimage.sh $boarddir/mkimage.sh
cp $outputdir/images/$osname-$board.img $basedir cp $outputdir/images/$osname-$board.img $basedir
mv $basedir/$osname-$board.img $basedir/$osname-$board-$osversion.img mv $basedir/$osname-$board.img $basedir/$osname-$board-$osversion.img
rm -f $basedir/$osname-$board-$osversion.img.xz
xz -6ek $basedir/$osname-$board-$osversion.img
echo "your xz image is ready at $basedir/$osname-$board-$osversion.img.xz"
rm -f $basedir/$osname-$board-$osversion.img.gz rm -f $basedir/$osname-$board-$osversion.img.gz
$gzip $basedir/$osname-$board-$osversion.img $gzip $basedir/$osname-$board-$osversion.img
echo "your image is ready at $basedir/$osname-$board-$osversion.img.gz" echo "your gz image is ready at $basedir/$osname-$board-$osversion.img.gz"
elif [ -n "$target" ]; then elif [ -n "$target" ]; then
make O=$outputdir $target make O=$outputdir $target
else else