diff options
| author | Daniel Baumann <mail@daniel-baumann.ch> | 2013-04-06 10:46:04 +0200 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:07 +0200 |
| commit | 8f293ccd9c3992dc962c440c028d905fdc9939e9 (patch) | |
| tree | 08cf6fb42f0565555547715fc3b886d7af56b03b | |
| parent | 06dac65ee377e081a4285590952fb8e13674f5b8 (diff) | |
| download | vyos-live-build-8f293ccd9c3992dc962c440c028d905fdc9939e9.tar.gz vyos-live-build-8f293ccd9c3992dc962c440c028d905fdc9939e9.zip | |
Dropping now unused intermediate config/image.
| -rw-r--r-- | examples/gitignore | 2 | ||||
| -rwxr-xr-x | functions/defaults.sh | 12 | ||||
| -rwxr-xr-x | scripts/build/config | 24 |
3 files changed, 16 insertions, 22 deletions
diff --git a/examples/gitignore b/examples/gitignore index 918c4dffc..6e6fefe5f 100644 --- a/examples/gitignore +++ b/examples/gitignore @@ -20,7 +20,7 @@ config/chroot config/common config/source -config/image +config/build source/ source*.iso diff --git a/functions/defaults.sh b/functions/defaults.sh index ff268ba0b..fb2894c4d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -36,22 +36,22 @@ New_configuration () ## Configuration # Configuration-Version - LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/image Configuration-Version)}" + LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build Configuration-Version)}" LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-${LIVE_BUILD_VERSION}}" export LIVE_CONFIGURATION_VERSION # Image: Name - LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/image Name)}" + LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build Name)}" LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}" export LIVE_IMAGE_NAME # Image: Architecture (FIXME: Support and default to 'any') - LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/image Architecture)}" + LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build Architecture)}" LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-${CURRENT_IMAGE_ARCHITECTURE}}" export LIVE_IMAGE_ARCHITECTURE # Image: Archive Areas - LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/image Archive-Areas)}" + LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build Archive-Areas)}" case "${LB_MODE}" in progress-linux) @@ -70,12 +70,12 @@ New_configuration () export LIVE_IMAGE_ARCHIVE_AREAS # Image: Archive Areas - LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/image Parent-Archive-Areas)}" + LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}" LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LIVE_IMAGE_ARCHIVE_AREAS}}" export LIVE_IMAGE_PARENT_ARCHIVE_AREAS # Image: Type - LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/image Type)}" + LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build Type)}" LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-iso-hybrid}" export LIVE_IMAGE_TYPE } diff --git a/scripts/build/config b/scripts/build/config index c5de3fc2b..7fb50542a 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -1379,21 +1379,6 @@ Echo_warning "WARNING: THIS VERSION OF LIVE-BUILD IS EXPERIMENTAL!" Echo_warning "IT IS UNFINISHED AND CHANGES HEAVILY WITHOUT PRIOR NOTICE." Echo_warning "USER DISCRETION IS ADVISED." -if [ ! -e config/image ] -then - _NEW_CONFIG="true" -fi - -# config/image -Set_configuration "config/image" "Configuration-Version" "${LIVE_CONFIGURATION_VERSION}" -[ "${_NEW_CONFIG}" = "true" ] && echo "" >> config/image -Set_configuration "config/image" "Name" "${LIVE_IMAGE_NAME}" -Set_configuration "config/image" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}" -Set_configuration "config/image" "Archive-Areas" "${LIVE_IMAGE_ARCHIVE_AREAS}" -[ "${LB_DERIVATIVE}" = "true" ] && Set_configuration "config/image" "Parent-Archive-Areas" "${LIVE_IMAGE_PARENT_ARCHIVE_AREAS}" # FIXME -Set_configuration "config/image" "Type" "${LIVE_IMAGE_TYPE}" - -# config/build cat > config/build << EOF [Image] Architecture: ${LIVE_IMAGE_ARCHITECTURE} @@ -1406,6 +1391,7 @@ if [ "${LB_DERIVATIVE}" = "true" ] then cat >> config/build << EOF + Parent-Archive-Areas: ${LIVE_IMAGE_ARCHIVE_AREAS} Parent-Distribution: ${LB_DISTRIBUTION} Parent-Mirror-Bootstrap: ${LB_PARENT_MIRROR_BOOTSTRAP} @@ -1413,5 +1399,13 @@ EOF fi +cat >> config/build << EOF + +[FIXME] +Configuration-Version: ${LIVE_CONFIGURATION_VERSION} +Name: ${LIVE_IMAGE_NAME} +Type: ${LIVE_IMAGE_TYPE} +EOF + # Creating stage file Create_stagefile .build/config |