From 75a1f0526aabc030b43d5252388f97567ad9118b Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 27 Jan 2019 22:20:09 +0200
Subject: [PATCH 1/3] Add support for /etc/environment

---
 board/common/overlay/etc/init.d/rcS |  5 +++++
 board/common/overlay/etc/profile    | 11 ++++++++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/board/common/overlay/etc/init.d/rcS b/board/common/overlay/etc/init.d/rcS
index 20c2ce1cd5..f8f6f2aa2b 100755
--- a/board/common/overlay/etc/init.d/rcS
+++ b/board/common/overlay/etc/init.d/rcS
@@ -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
 
diff --git a/board/common/overlay/etc/profile b/board/common/overlay/etc/profile
index 189f73c23f..f56cf28154 100644
--- a/board/common/overlay/etc/profile
+++ b/board/common/overlay/etc/profile
@@ -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
+

From 4cbc7b8e655bf215eb87466a4c750f346e9f6b66 Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 27 Jan 2019 22:23:11 +0200
Subject: [PATCH 2/3] Remove /etc/profile.d

---
 board/common/cleanups.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/board/common/cleanups.sh b/board/common/cleanups.sh
index ef7a8fee2d..f4ebfa13a9 100755
--- a/board/common/cleanups.sh
+++ b/board/common/cleanups.sh
@@ -218,3 +218,5 @@ rm -f ${TARGET}/etc/init.d/S91smb
 # other unwanted dirs
 rm -rf ${TARGET}/data/*
 rm -rf ${TARGET}/run
+rm -rf ${TARGET}/etc/profile.d
+

From abd5ee8eb32131fd811e5c78e786ae9338443f2f Mon Sep 17 00:00:00 2001
From: Calin Crisan <ccrisan@gmail.com>
Date: Sun, 27 Jan 2019 22:52:04 +0200
Subject: [PATCH 3/3] python-colibris: update to 0.4.3

---
 package/python-colibris/python-colibris.hash | 2 +-
 package/python-colibris/python-colibris.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/python-colibris/python-colibris.hash b/package/python-colibris/python-colibris.hash
index f472910c84..202a1471ac 100644
--- a/package/python-colibris/python-colibris.hash
+++ b/package/python-colibris/python-colibris.hash
@@ -1,2 +1,2 @@
-sha256	ef291ebd1935886d2aae0cb996da3dddcfb7253462df185980897b290fd26d78  colibris-0.4.2.tar.gz
+sha256	34b97ea0d4b91e6af8632efc0aff7d6c68e9470fb69dd8b277b890de79458d8d  colibris-0.4.3.tar.gz
 
diff --git a/package/python-colibris/python-colibris.mk b/package/python-colibris/python-colibris.mk
index 04fd0f9b4b..c5c31d91c4 100644
--- a/package/python-colibris/python-colibris.mk
+++ b/package/python-colibris/python-colibris.mk
@@ -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