mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-24 11:46:30 +00:00
Merge branch 'thingos' into dev
This commit is contained in:
commit
762125130d
@ -30,7 +30,7 @@ case "$1" in
|
||||
3
|
||||
${data_start}
|
||||
\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
|
||||
test -b $data_dev && msg_done || msg_fail
|
||||
|
||||
|
@ -6,7 +6,7 @@ conf="/data/etc/wpa_supplicant.conf"
|
||||
|
||||
log="/var/log/wpa_supplicant.log"
|
||||
prog="/usr/sbin/wpa_supplicant"
|
||||
driver=wext
|
||||
driver=nl80211,wext
|
||||
|
||||
sys_watch_conf="/etc/watch.conf"
|
||||
boot_watch_conf="/boot/watch.conf"
|
||||
|
@ -1,4 +1,4 @@
|
||||
#!/bin/bash
|
||||
|
||||
sed 's/#initrd_filename=.*/initrd_filename=initrd.img/' uEnv.txt
|
||||
sed 's/#initrd_filename=.*/initrd_filename=fwupdater.img/' uEnv.txt
|
||||
|
||||
|
@ -7,6 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
|
||||
BR2_TARGET_OPTIMIZATION="-pipe"
|
||||
BR2_ROOTFS_SKELETON_CUSTOM=y
|
||||
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_POST_BUILD_SCRIPT="board/common/postscript.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
@ -7,6 +7,7 @@ BR2_TOOLCHAIN_EXTERNAL=y
|
||||
BR2_TARGET_OPTIMIZATION="-pipe"
|
||||
BR2_ROOTFS_SKELETON_CUSTOM=y
|
||||
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_POST_BUILD_SCRIPT="board/common/postscript.sh"
|
||||
BR2_LINUX_KERNEL=y
|
||||
|
Loading…
x
Reference in New Issue
Block a user