diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-07-19 19:37:26 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-07-19 21:11:59 +0200 |
| commit | 8473b925fd94fdb7bb1ae6309a4ab58d490382c9 (patch) | |
| tree | 94b76a6288395e37619b900f3eea2009a25d9b28 /functions | |
| parent | 6c0ddb7d6d72d15ab2887a4b40de2c5d71f26d3a (diff) | |
| download | vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.tar.gz vyos-live-build-8473b925fd94fdb7bb1ae6309a4ab58d490382c9.zip | |
Fixing up inclusion of functions while allowing local usage of live-build with different file layouts.
Diffstat (limited to 'functions')
| -rwxr-xr-x | functions/common.sh | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 21 | ||||
| -rwxr-xr-x | functions/packagelists.sh | 2 |
3 files changed, 16 insertions, 9 deletions
diff --git a/functions/common.sh b/functions/common.sh index 538d180b0..19c3bc052 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -9,7 +9,7 @@ PROGRAM="live-build" -VERSION="$(cat ${LB_BASE}/VERSION)" +VERSION="$(if [ -e ${LIVE_BUILD}/VERSION ]; then cat ${LIVE_BUILD}/VERSION; else cat /usr/share/live/build/VERSION; fi)" CONFIG_VERSION="$(echo ${VERSION} | awk -F- '{ print $1 }')" PATH="${PWD}/local/scripts:${PATH}" diff --git a/functions/defaults.sh b/functions/defaults.sh index 5e06c485f..c9b9e00fe 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -14,12 +14,9 @@ Set_defaults () if [ -e local/live-build ] then - LB_BASE="${LB_BASE:-${PWD}/local/live-build}" + LIVE_BUILD="${LIVE_BUILD:-${PWD}/local/live-build}" PATH="${PWD}/local/live-build/scripts/build:${PATH}" - export LB_BASE PATH - else - LB_BASE="${LB_BASE:-/usr/share/live/build}" - export LB_BASE + export LIVE_BUILD PATH fi # Setting system type @@ -322,10 +319,20 @@ Set_defaults () esac # Setting includes - LB_INCLUDES="${LB_INCLUDES:-${LB_BASE}/includes}" + if [ -n "${LIVE_BUID}" ] + then + LB_INCLUDES="${LB_INCLUDES:-${LIVE_BUILD}/includes}" + else + LB_INCLUDES="${LB_INCLUDES:-/usr/share/live/build/includes}" + fi # Setting templates - LB_TEMPLATES="${LB_TEMPLATES:-${LB_BASE}/templates}" + if [ -n "${LIVE_BUID}" ] + then + LB_TEMPLATES="${LB_TEMPLATES:-${LIVE_BUILD}/templates}" + else + LB_TEMPLATES="${LB_TEMPLATES:-/usr/share/live/build/templates}" + fi # Setting live build options _BREAKPOINTS="${_BREAKPOINTS:-false}" diff --git a/functions/packagelists.sh b/functions/packagelists.sh index bb16bb25c..0e2d5ff57 100755 --- a/functions/packagelists.sh +++ b/functions/packagelists.sh @@ -22,7 +22,7 @@ Expand_packagelist () _LB_NESTED=0 _LB_ENABLED=1 - for _LB_SEARCH_PATH in ${@} "${LB_BASE:-/usr/share/live/build}/package-lists" + for _LB_SEARCH_PATH in ${@} "${LIVE_BUILD}/package-lists" /usr/share/live/build/package-lists do if [ -e "${_LB_SEARCH_PATH}/${_LB_LIST_NAME}" ] then |