pygos/build
1
0
Fork 0
mirror of https://github.com/pygos/build.git synced 2024-11-25 12:20:42 +01:00
Code Issues Releases Wiki Activity

Fix missing LAYERCONF in check_update script

Browse source 
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
This commit is contained in:
David Oberhollenzer 2018-09-27 23:51:15 +02:00
parent 5b17bc9526
commit b4824a9f29
2 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
check_update.sh
View file

@ -6,6 +6,7 @@ SCRIPTDIR=$(cd $(dirname "${BASH_SOURCE[0]}") && pwd)
# dummy toolchain variables # dummy toolchain variables
export LINUXPKG="linux" export LINUXPKG="linux"
export LAYERCONF=""
# utilities # utilities
source "$SCRIPTDIR/util/depends.sh" source "$SCRIPTDIR/util/depends.sh"

12
util/override.sh
View file

@ -1,6 +1,10 @@
file_path_override() { file_path_override() {
local layer local layer
if [ -z "$LAYERCONF" ]; then
return
fi
tac "$LAYERCONF" | while read layer; do tac "$LAYERCONF" | while read layer; do
if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then
echo "$SCRIPTDIR/layer/$layer/$1" echo "$SCRIPTDIR/layer/$layer/$1"
@ -20,6 +24,10 @@ cat_file_override() {
cat_file_merge() { cat_file_merge() {
local layer local layer
if [ -z "$LAYERCONF" ]; then
return
fi
while read layer; do while read layer; do
if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then
cat "$SCRIPTDIR/layer/$layer/$1" cat "$SCRIPTDIR/layer/$layer/$1"
@ -38,6 +46,10 @@ include_override() {
include_merge() { include_merge() {
local layer local layer
if [ -z "$LAYERCONF" ]; then
return
fi
while read layer; do while read layer; do
if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then if [ -e "$SCRIPTDIR/layer/$layer/$1" ]; then
source "$SCRIPTDIR/layer/$layer/$1" source "$SCRIPTDIR/layer/$layer/$1"