manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adding support for live-images configs and arbitrary configuration directories in lb_config --config option.

This commit is contained in:
Daniel Baumann 2012-12-13 18:51:54 +01:00
parent 1f07481fbc
commit 3f19c0c357
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
scripts/build/config
View File

@ -874,17 +874,28 @@ fi
if [ -n "${_CONFIG}" ] if [ -n "${_CONFIG}" ]
then then
_GIT_REPOSITORY="$(echo ${_CONFIG} | sed -e 's|::.*$||')" if [ -e "${_CONFIG}" ] || [ -e "/usr/share/live/images/${_CONFIG}" ]
Echo_message "Cloning ${_GIT_REPOSITORY}"
git clone ${_GIT_REPOSITORY} ./
if [ "${_GIT_REPOSITORY}" != "${_CONFIG}" ]
then then
_GIT_BRANCH="$(echo ${_CONFIG} | awk -F\:\: '{ print $NF }')" if [ ! -e "${_CONFIG}" ] && [ -e "/usr/share/live/images/${_CONFIG}" ]
then
_CONFIG="/usr/share/live/images/${_CONFIG}"
fi
Echo_message "Checking out ${_GIT_BRANCH}" Echo_message "Copying ${_CONFIG}"
git checkout ${_GIT_BRANCH} tar -C "${_CONFIG}" -c . | tar -C ./ -x
else
_GIT_REPOSITORY="$(echo ${_CONFIG} | sed -e 's|::.*$||')"
Echo_message "Cloning ${_GIT_REPOSITORY}"
git clone ${_GIT_REPOSITORY} ./
if [ "${_GIT_REPOSITORY}" != "${_CONFIG}" ]
then
_GIT_BRANCH="$(echo ${_CONFIG} | awk -F\:\: '{ print $NF }')"
Echo_message "Checking out ${_GIT_BRANCH}"
git checkout ${_GIT_BRANCH}
fi
fi fi
if [ -e auto/config ] if [ -e auto/config ]