diff --git a/board/bananapi/postscript.sh b/board/bananapi/postscript.sh index 7eecf8486a..dea94dadbf 100755 --- a/board/bananapi/postscript.sh +++ b/board/bananapi/postscript.sh @@ -7,6 +7,3 @@ cp $IMG_DIR/sun7i-a20-bananapi.dtb $BOOT_DIR $UBOOT_HOST_DIR/tools/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr -# disable software updating -sed -i 's/enable_update true/enable_update false/' $TARGET/etc/motioneye.conf - diff --git a/board/common/overlay/etc/version b/board/common/overlay/etc/version index d7b4c0174e..f8e5ac9d50 100644 --- a/board/common/overlay/etc/version +++ b/board/common/overlay/etc/version @@ -1,4 +1,4 @@ -os_name="motionEyeOS" -os_short_name="motioneyeos" +os_name="thingOS" +os_short_name="thingos" os_prefix="meye" -os_version="20170212" +os_version="20170218" diff --git a/board/odroidc1/postscript.sh b/board/odroidc1/postscript.sh index b963a45140..db05fded9e 100755 --- a/board/odroidc1/postscript.sh +++ b/board/odroidc1/postscript.sh @@ -9,9 +9,6 @@ cp $BOARD_DIR/bl1.bin.hardkernel $IMG_DIR cp $BOARD_DIR/u-boot.bin $IMG_DIR cp $BOARD_DIR/boot.ini $BOOT_DIR -# disable software updating -sed -i 's/enable_update true/enable_update false/' $TARGET/etc/motioneye.conf - # fix some lib dirs if ! [ -L $TARGET/lib/arm-linux-gnueabihf ]; then mv $TARGET/lib/arm-linux-gnueabihf/* $TARGET/lib diff --git a/board/odroidc2/postscript.sh b/board/odroidc2/postscript.sh index f2ae24cf74..736aae2875 100755 --- a/board/odroidc2/postscript.sh +++ b/board/odroidc2/postscript.sh @@ -8,6 +8,3 @@ cp $IMG_DIR/meson64_odroidc2.dtb $BOOT_DIR cp $BOARD_DIR/bl1.bin.hardkernel $IMG_DIR cp $BOARD_DIR/u-boot.bin $IMG_DIR cp $BOARD_DIR/boot.ini $BOOT_DIR - -# disable software updating -sed -i 's/enable_update true/enable_update false/' $TARGET/etc/motioneye.conf diff --git a/board/odroidxu4/postscript.sh b/board/odroidxu4/postscript.sh index e1636023a3..231c5df642 100755 --- a/board/odroidxu4/postscript.sh +++ b/board/odroidxu4/postscript.sh @@ -10,7 +10,3 @@ cp $BOARD_DIR/bl2.bin.hardkernel $IMG_DIR cp $BOARD_DIR/tzsw.bin.hardkernel $IMG_DIR cp $BOARD_DIR/u-boot.bin $IMG_DIR cp $BOARD_DIR/boot.ini $BOOT_DIR - -# disable software updating -sed -i 's/enable_update true/enable_update false/' $TARGET/etc/motioneye.conf - diff --git a/build.sh b/build.sh index 7d00b3b57b..f7e3963b1d 100755 --- a/build.sh +++ b/build.sh @@ -11,6 +11,7 @@ board=$1 target=${*:2} cd $(dirname $0) basedir=$(pwd) +osname=$(source $basedir/board/common/overlay/etc/version && echo $os_short_name) gzip=$(which pigz || which gzip) if [ "$board" == "all" ]; then @@ -42,11 +43,11 @@ if [ "$target" == "mkimage" ]; then $boarddir/mkimage.sh elif [ "$target" == "mkrelease" ]; then $boarddir/mkimage.sh - cp $outputdir/images/motioneyeos-$board.img $basedir + cp $outputdir/images/$osname-$board.img $basedir date=$(date +%Y%m%d) - mv $basedir/motioneyeos-$board.img $basedir/motioneyeos-$board-$date.img - rm -f $basedir/motioneyeos-$board-$date.img.gz - $gzip $basedir/motioneyeos-$board-$date.img + mv $basedir/$osname-$board.img $basedir/$osname-$board-$date.img + rm -f $basedir/$osname-$board-$date.img.gz + $gzip $basedir/$osname-$board-$date.img elif [ -n "$target" ]; then make O=$outputdir $target else