From b4824a9f2950571e43b20bb632058ea1c7a7277c Mon Sep 17 00:00:00 2001 From: David Oberhollenzer Date: Thu, 27 Sep 2018 23:51:15 +0200 Subject: [PATCH] Fix missing LAYERCONF in check_update script Signed-off-by: David Oberhollenzer --- check_update.sh | 1 + util/override.sh | 12 ++++++++++++ 2 files changed, 13 insertions(+) diff --git a/check_update.sh b/check_update.sh index f6cb249..15ba746 100755 --- a/check_update.sh +++ b/check_update.sh @@ -6,6 +6,7 @@ SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd) # dummy toolchain variables export LINUXPKG="linux" +export LAYERCONF="" # utilities source "$SCRIPTDIR/util/depends.sh" diff --git a/util/override.sh b/util/override.sh index 08be3d1..e8b13ea 100644 --- a/util/override.sh +++ b/util/override.sh @@ -1,6 +1,10 @@ file_path_override() { local layer + if [ -z "$LAYERCONF" ]; then + return + fi + tac "$LAYERCONF" | while read layer; do if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then echo "$SCRIPTDIR/layer/$layer/$1" @@ -20,6 +24,10 @@ cat_file_override() { cat_file_merge() { local layer + if [ -z "$LAYERCONF" ]; then + return + fi + while read layer; do if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then cat "$SCRIPTDIR/layer/$layer/$1" @@ -38,6 +46,10 @@ include_override() { include_merge() { local layer + if [ -z "$LAYERCONF" ]; then + return + fi + while read layer; do if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then source "$SCRIPTDIR/layer/$layer/$1"