jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-24 11:46:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thingos' into thingos-next

Browse Source
This commit is contained in:
Calin Crisan 2018-03-31 18:32:41 +03:00
commit 2b1fac01c3
21 changed files with 43 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/bananapi/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
UBOOT_HOST_DIR=$TARGET/../build/host-uboot-tools-*
cp $IMG_DIR/uImage $BOOT_DIR

10
board/common/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
export TARGET="$1"
export BOARD=$(basename $(dirname $TARGET))
export COMMON_DIR=$(dirname $0)
@ -9,7 +11,9 @@ export IMG_DIR=$TARGET/../images
mkdir -p $BOOT_DIR
test -x $BOARD_DIR/postscript.sh && $BOARD_DIR/postscript.sh
if [ -x $BOARD_DIR/postscript.sh ]; then
$BOARD_DIR/postscript.sh
fi
# transform /var contents as needed
rm -rf $TARGET/var/cache
@ -30,7 +34,9 @@ ln -s /tmp $TARGET/var/tmp
# cleanups
$COMMON_DIR/cleanups.sh
test -x $BOARD_DIR/cleanups.sh && test -x $BOARD_DIR/cleanups.sh || true
if [ -x $BOARD_DIR/cleanups.sh ]; then
$BOARD_DIR/cleanups.sh
fi
# board-specific os.conf
if [ -r $BOARD_DIR/os.conf ]; then

2
board/nanopineo2/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr

2
board/odroidc1/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
# boot directory
mkdir -p $BOOT_DIR

2
board/odroidc2/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
# boot directory
mkdir -p $BOOT_DIR

2
board/odroidxu4/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
# boot directory
mkdir -p $BOOT_DIR

2
board/orangepione/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot.cmd $BOOT_DIR/boot.scr
$HOST_DIR/bin/mkimage -C none -A arm -T script -d $BOARD_DIR/boot-fwupdater.cmd $BOOT_DIR/boot-fwupdater.scr

2
board/pine64/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
# boot directory
mkdir -p $BOOT_DIR/pine64

1
board/raspberrypi/overlay/usr/libexec/fw-prepare-boot
View File

@ -1,4 +1,5 @@
#!/bin/bash
echo >> /boot/config.txt
echo "initramfs fwupdater.gz" >> /boot/config.txt

2
board/raspberrypi/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
RPI_FW_DIR=$TARGET/../images/rpi-firmware
cp $BOARD_DIR/config.txt $BOOT_DIR

1
board/raspberrypi2/overlay/usr/libexec/fw-prepare-boot
View File

@ -1,4 +1,5 @@
#!/bin/bash
echo >> /boot/config.txt
echo "initramfs fwupdater.gz" >> /boot/config.txt

2
board/raspberrypi2/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
RPI_FW_DIR=$TARGET/../images/rpi-firmware
cp $BOARD_DIR/config.txt $BOOT_DIR

1
board/raspberrypi3/overlay/usr/libexec/fw-prepare-boot
View File

@ -1,4 +1,5 @@
#!/bin/bash
echo >> /boot/config.txt
echo "initramfs fwupdater.gz" >> /boot/config.txt

4
board/raspberrypi3/postscript.sh
View File

@ -1,5 +1,7 @@
#!/bin/sh
set -e
RPI_FW_DIR=$TARGET/../images/rpi-firmware
cp $BOARD_DIR/config.txt $BOOT_DIR
@ -7,6 +9,8 @@ cp $BOARD_DIR/cmdline.txt $BOOT_DIR
cp $BOARD_DIR/fwupdater.gz $BOOT_DIR
cp $IMG_DIR/zImage $BOOT_DIR/kernel.img
cp $IMG_DIR/bcm2710-rpi-3-b.dtb $BOOT_DIR
cp $IMG_DIR/bcm2710-rpi-3-b-plus.dtb $BOOT_DIR
cp $IMG_DIR/bcm2710-rpi-cm3.dtb $BOOT_DIR
cp $RPI_FW_DIR/bootcode.bin $BOOT_DIR
cp $RPI_FW_DIR/start.elf $BOOT_DIR
cp $RPI_FW_DIR/fixup.dat $BOOT_DIR

5
build.sh
View File

@ -104,6 +104,9 @@ elif [ "$target" == "clean-target" ]; then
echo "removing .stamp_host_installed files"
find $outputdir/build -name .stamp_host_installed | xargs -r rm
echo "removing .stamp_images_installed files"
find $outputdir/build -name .stamp_images_installed | xargs -r rm
fi
if [ -f $outputdir/.config ]; then
@ -120,7 +123,7 @@ elif [ -n "$target" ]; then
make O=$outputdir $target
else # if [ -z "$target ]
$0 $b all
$0 $board all
echo "build successful"
fi

1
configs/orangepione_defconfig
View File

@ -32,7 +32,6 @@ BR2_PACKAGE_LIBWEBCAM=y
BR2_PACKAGE_MOTION=y
BR2_PACKAGE_GZIP=y
BR2_PACKAGE_JQ=y
BR2_PACKAGE_E2FSPROGS=y
BR2_PACKAGE_CIFS_UTILS=y
BR2_PACKAGE_NTFS_3G=y
BR2_PACKAGE_B43_FIRMWARE=y

2
configs/raspberrypi2_defconfig
View File

@ -14,7 +14,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/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/81dda1af754c3af667944af7156bf1c5cdf9beee.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2709-rpi-2-b"

4
configs/raspberrypi3_defconfig
View File

@ -14,10 +14,10 @@ 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/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/81dda1af754c3af667944af7156bf1c5cdf9beee.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="bcm2709"
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b"
BR2_LINUX_KERNEL_INTREE_DTS_NAME="bcm2710-rpi-3-b bcm2710-rpi-3-b-plus bcm2710-rpi-cm3"
BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"
BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
BR2_PACKAGE_MOTIONEYE=y

2
configs/raspberrypi_defconfig
View File

@ -21,7 +21,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/4153f509b449f1c1c816cf124c314975c3daa824.tar.gz"
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/raspberrypi/linux/archive/81dda1af754c3af667944af7156bf1c5cdf9beee.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 = 93aae1391121c44c7bbddf66abaf38725ffa2dc0
RPI_FIRMWARE_VERSION = ce8652e2c743f02f04cb29f23611cbf13765483b
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 = 3cd60d45bc7c9d3ec8daee574bc99027cb1bab9e
RPI_USERLAND_VERSION = a343dcad1dae4e93f4bfb99496697e207f91027e
RPI_USERLAND_SITE = $(call github,raspberrypi,userland,$(RPI_USERLAND_VERSION))
RPI_USERLAND_LICENSE = BSD-3-Clause
RPI_USERLAND_LICENSE_FILES = LICENCE