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

fix merge leftover

Browse Source
This commit is contained in:
Calin Crisan 2017-03-07 20:09:33 +02:00
parent 09ac214491
commit 4a1ae58585
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/common/cleanups.sh
View File

@ -191,10 +191,7 @@ rm -f $TARGET/etc/init.d/S20urandom
rm -f $TARGET/etc/init.d/S80dhcp-relay
rm -f $TARGET/etc/init.d/S80dhcp-server
rm -f $TARGET/etc/init.d/S91smb
<<<<<<< HEAD
rm -f $TARGET/etc/init.d/S99motion
=======
>>>>>>> thingos/master
# other unwanted dirs
rm -rf $TARGET/data/*

1
configs/odroidc1_defconfig
View File

@ -26,6 +26,7 @@ BR2_LINUX_KERNEL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL=y
BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/hardkernel/linux/archive/647316d8199babad4cd22309849842e035494f2b.tar.gz"
BR2_LINUX_KERNEL_DEFCONFIG="odroidc"
BR2_LINUX_KERNEL_UIMAGE=y
BR2_LINUX_KERNEL_DTS_SUPPORT=y
BR2_LINUX_KERNEL_INTREE_DTS_NAME="meson8b_odroidc"
BR2_PACKAGE_BUSYBOX_CONFIG="board/common/busybox.config"