From 24c89932be352f4357cf3fe2c7be6b00a20c6cdb Mon Sep 17 00:00:00 2001 From: Robert Collins Date: Mon, 8 Apr 2013 10:26:44 +1200 Subject: [PATCH] Always include the in-tree elements directory. Change-Id: I5a79fbf0568f5755dd14824ed147093387170b3f --- README.md | 3 ++- lib/img-defaults | 4 +++- lib/ramdisk-defaults | 4 +++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 74091615b..da0ee4af7 100644 --- a/README.md +++ b/README.md @@ -272,7 +272,8 @@ get help. Using the variable ELEMENTS\_PATH will allow to specify multiple elements locations. It's a colon (:) separated path list, and it will work in a first path/element found, -first served approach. +first served approach. The included elements tree is used when no path is supplied, +and is added to the end of the path if a path is supplied. Copyright ========= diff --git a/lib/img-defaults b/lib/img-defaults index 70177b3b2..a1350f001 100644 --- a/lib/img-defaults +++ b/lib/img-defaults @@ -22,4 +22,6 @@ IMAGE_NAME=${IMAGE_NAME:-image} export IMAGE_SIZE=${IMAGE_SIZE:-2} # N.B. This size is in GB # Set via the CLI normally. # IMAGE_ELEMENT= -export ELEMENTS_PATH=${ELEMENTS_PATH:-$(dirname $0)/../elements} +_BASE_ELEMENT_DIR=$(dirname $0)/../elements +ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"} +export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR} diff --git a/lib/ramdisk-defaults b/lib/ramdisk-defaults index c611b486b..760bb6dc4 100644 --- a/lib/ramdisk-defaults +++ b/lib/ramdisk-defaults @@ -21,4 +21,6 @@ MODULE_ROOT=${MODULE_ROOT:-""} LIB_UDEV_ROOT=${LIB_UDEV_ROOT:-""} BUSYBOX=${BUSYBOX:-$(which busybox)} IMAGE_NAME=${IMAGE_NAME:-"ramdisk"} -export ELEMENTS_PATH=${ELEMENTS_PATH:-$(dirname $0)/../elements} +_BASE_ELEMENT_DIR=$(dirname $0)/../elements +ELEMENTS_PATH=${ELEMENTS_PATH:+"$ELEMENTS_PATH:$_BASE_ELEMENT_DIR"} +export ELEMENTS_PATH=${ELEMENTS_PATH:-$_BASE_ELEMENT_DIR}