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

Merge branch 'thingos' into dev

Browse Source
This commit is contained in:
Calin Crisan 2017-06-03 18:17:42 +03:00
commit 762125130d
6 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/common/overlay/etc/init.d/S00datapart
View File

@ -30,7 +30,7 @@ case "$1" in
3 3
${data_start} ${data_start}
\n \n
w" | /sbin/fdisk $disk_dev 2>&1 >/dev/null | grep -v "Device or resource busy" | grep -v '^$' w" | /sbin/fdisk $disk_dev &>/dev/null
partx -a $disk_dev &>/dev/null partx -a $disk_dev &>/dev/null
test -b $data_dev && msg_done || msg_fail test -b $data_dev && msg_done || msg_fail

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

@ -6,7 +6,7 @@ conf="/data/etc/wpa_supplicant.conf"
log="/var/log/wpa_supplicant.log" log="/var/log/wpa_supplicant.log"
prog="/usr/sbin/wpa_supplicant" prog="/usr/sbin/wpa_supplicant"
driver=wext driver=nl80211,wext
sys_watch_conf="/etc/watch.conf" sys_watch_conf="/etc/watch.conf"
boot_watch_conf="/boot/watch.conf" boot_watch_conf="/boot/watch.conf"

0
board/pine64/initrd.img → board/pine64/fwupdater.img
View File

2
board/pine64/overlay/usr/libexec/fw-prepare-boot
View File

@ -1,4 +1,4 @@
#!/bin/bash #!/bin/bash
sed 's/#initrd_filename=.*/initrd_filename=initrd.img/' uEnv.txt sed 's/#initrd_filename=.*/initrd_filename=fwupdater.img/' uEnv.txt

1
configs/odroidc2_defconfig
View File

@ -7,6 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_OPTIMIZATION="-pipe"
BR2_ROOTFS_SKELETON_CUSTOM=y BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton" BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay" BR2_ROOTFS_OVERLAY="board/common/overlay board/odroidc2/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL=y

1
configs/pine64_defconfig
View File

@ -7,6 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
BR2_TARGET_OPTIMIZATION="-pipe" BR2_TARGET_OPTIMIZATION="-pipe"
BR2_ROOTFS_SKELETON_CUSTOM=y BR2_ROOTFS_SKELETON_CUSTOM=y
BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton" BR2_ROOTFS_SKELETON_CUSTOM_PATH="board/common/skeleton"
BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_EUDEV=y
BR2_ROOTFS_OVERLAY="board/common/overlay board/pine64/overlay" BR2_ROOTFS_OVERLAY="board/common/overlay board/pine64/overlay"
BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh" BR2_ROOTFS_POST_BUILD_SCRIPT="board/common/postscript.sh"
BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL=y