mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-24 11:46:30 +00:00
Merge remote-tracking branch 'thingos/dev' into dev
This commit is contained in:
commit
0cff6f52b0
@ -219,3 +219,5 @@ rm -f ${TARGET}/etc/init.d/S99motion
|
||||
# other unwanted dirs
|
||||
rm -rf ${TARGET}/data/*
|
||||
rm -rf ${TARGET}/run
|
||||
rm -rf ${TARGET}/etc/profile.d
|
||||
|
||||
|
@ -4,6 +4,11 @@ BOOT_LOG=/var/log/boot.log
|
||||
TMP_BOOT_LOG=/tmp/_boot.log
|
||||
PID_FILE=/tmp/rc.pid
|
||||
|
||||
set -a
|
||||
test -f /etc/environment && source /etc/environment
|
||||
test -f /data/etc/environment && source /data/etc/environment
|
||||
test -f /boot/etc/environment && source /boot/etc/environment
|
||||
set +a
|
||||
|
||||
source /etc/init.d/base
|
||||
|
||||
|
@ -27,6 +27,11 @@ if [ "$PS1" ]; then
|
||||
export TERM=linux
|
||||
fi;
|
||||
|
||||
if [ -f /data/etc/profile ]; then
|
||||
source /data/etc/profile
|
||||
fi
|
||||
# custom local profile
|
||||
test -f /data/etc/profile && source /data/etc/profile
|
||||
|
||||
# global environment variables
|
||||
test -f /etc/environment && source /etc/environment
|
||||
test -f /data/etc/environment && source /data/etc/environment
|
||||
test -f /boot/etc/environment && source /boot/etc/environment
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
sha256 ef291ebd1935886d2aae0cb996da3dddcfb7253462df185980897b290fd26d78 colibris-0.4.2.tar.gz
|
||||
sha256 34b97ea0d4b91e6af8632efc0aff7d6c68e9470fb69dd8b277b890de79458d8d colibris-0.4.3.tar.gz
|
||||
|
||||
|
@ -4,9 +4,9 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
PYTHON_COLIBRIS_VERSION = 0.4.2
|
||||
PYTHON_COLIBRIS_VERSION = 0.4.3
|
||||
PYTHON_COLIBRIS_SOURCE = colibris-$(PYTHON_COLIBRIS_VERSION).tar.gz
|
||||
PYTHON_COLIBRIS_SITE = https://files.pythonhosted.org/packages/05/88/2fcf6ddd6c9591147b14f691b9bf4007cc909a0f2f2e9fa8af5150a8e59d
|
||||
PYTHON_COLIBRIS_SITE = https://files.pythonhosted.org/packages/b7/ff/df9dd2a27f33f1d6003037f0597c4652dca50525f67f44f182ecc49c2baf
|
||||
PYTHON_COLIBRIS_SETUP_TYPE = setuptools
|
||||
PYTHON_COLIBRIS_LICENSE = Apache-2.0
|
||||
PYTHON_COLIBRIS_LICENSE_FILES = LICENSE.txt
|
||||
|
Loading…
x
Reference in New Issue
Block a user