jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 05:06:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thingos' into dev

Browse Source
This commit is contained in:
Calin Crisan 2018-11-18 19:56:31 +02:00
commit 9f35f8f053
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
board/common/cleanups.sh
View File

@ -209,4 +209,4 @@ rm -f $TARGET/etc/init.d/S99motion
# other unwanted dirs # other unwanted dirs
rm -rf $TARGET/data/* rm -rf $TARGET/data/*
rm -rf $TARGET/run

1
board/common/overlay/run
View File

@ -1 +0,0 @@
tmp

13
board/common/postscript.sh
View File

@ -15,6 +15,12 @@ if [ -x $BOARD_DIR/postscript.sh ]; then
$BOARD_DIR/postscript.sh $BOARD_DIR/postscript.sh
fi fi
# cleanups
$COMMON_DIR/cleanups.sh
if [ -x $BOARD_DIR/cleanups.sh ]; then
$BOARD_DIR/cleanups.sh
fi
# transform /var contents as needed # transform /var contents as needed
rm -rf $TARGET/var/cache rm -rf $TARGET/var/cache
rm -rf $TARGET/var/lib rm -rf $TARGET/var/lib
@ -31,12 +37,7 @@ ln -s /data/log $TARGET/var/log
ln -s /tmp $TARGET/var/run ln -s /tmp $TARGET/var/run
ln -s /tmp $TARGET/var/spool ln -s /tmp $TARGET/var/spool
ln -s /tmp $TARGET/var/tmp ln -s /tmp $TARGET/var/tmp
ln -s /tmp $TARGET/run
# cleanups
$COMMON_DIR/cleanups.sh
if [ -x $BOARD_DIR/cleanups.sh ]; then
$BOARD_DIR/cleanups.sh
fi
# board-specific os.conf # board-specific os.conf
if [ -r $BOARD_DIR/os.conf ]; then if [ -r $BOARD_DIR/os.conf ]; then

7
package/skeleton-init-common/skeleton-init-common.mk
View File

@ -43,9 +43,10 @@ SKELETON_INIT_COMMON_BIN_SH = $(call qstrip,$(BR2_SYSTEM_BIN_SH))
ifneq ($(SKELETON_INIT_COMMON_HOSTNAME),) ifneq ($(SKELETON_INIT_COMMON_HOSTNAME),)
define SKELETON_INIT_COMMON_SET_HOSTNAME define SKELETON_INIT_COMMON_SET_HOSTNAME
mkdir -p $(TARGET_DIR)/etc mkdir -p $(TARGET_DIR)/etc
echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname test -f $(TARGET_DIR)/etc/hostname && \
test -f $(TARGET_DIR)/etc/hosts && $(SED) \ echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname || true
'$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTNAME)' \ test -f $(TARGET_DIR)/etc/hosts && \
$(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTNAME)' \
-e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts || true -e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts || true
endef endef
SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_HOSTNAME SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_HOSTNAME