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

Making configuration names in build.conf all lower case.

Browse Source
This commit is contained in:
Daniel Baumann 2014-08-25 23:00:56 +02:00
parent b78f2db21d
commit 5203e46e9d
2 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
components/init
View File

@ -247,44 +247,44 @@ def main():
config.add_section('build')
config.set('build','Architecture', architecture)
config.set('build','architecture', architecture)
config.set('build','Archive-Areas', archive_areas)
config.set('build','Parent-Archive-Areas', parent_archive_areas)
config.set('build','archive-areas', archive_areas)
config.set('build','parent-archive-areas', parent_archive_areas)
config.set('build','Distribution', distribution)
config.set('build','Parent-Distribution', parent_distribution)
config.set('build','distribution', distribution)
config.set('build','parent-distribution', parent_distribution)
config.set('build','Mirror-Bootstrap', mirror_bootstrap)
config.set('build','Parent-Mirror-Bootstrap', parent_mirror_bootstrap)
config.set('build','mirror-bootstrap', mirror_bootstrap)
config.set('build','parent-mirror-bootstrap', parent_mirror_bootstrap)
config.set('build','Mirror-Chroot', mirror_chroot)
config.set('build','Parent-Mirror-Chroot', parent_mirror_chroot)
config.set('build','mirror-chroot', mirror_chroot)
config.set('build','parent-mirror-chroot', parent_mirror_chroot)
config.set('build','Mirror-Chroot-Security', mirror_chroot_security)
config.set('build','Parent-Mirror-Chroot-Security', parent_mirror_chroot_security)
config.set('build','mirror-chroot-security', mirror_chroot_security)
config.set('build','parent-mirror-chroot-security', parent_mirror_chroot_security)
config.set('build','Mirror-Installer', mirror_installer)
config.set('build','Parent-Mirror-Installer', parent_mirror_installer)
config.set('build','mirror-installer', mirror_installer)
config.set('build','parent-mirror-installer', parent_mirror_installer)
config.set('build','Mirror-Binary', mirror_binary)
config.set('build','Parent-Mirror-Binary', parent_mirror_binary)
config.set('build','mirror-binary', mirror_binary)
config.set('build','parent-mirror-binary', parent_mirror_binary)
config.set('build','Mirror-Binary-Security', mirror_binary_security)
config.set('build','Parent-Mirror-Binary-Security', parent_mirror_binary_security)
config.set('build','mirror-binary-security', mirror_binary_security)
config.set('build','parent-mirror-binary-security', parent_mirror_binary_security)
config.set('build','Mirror-Source', mirror_source)
config.set('build','Parent-Mirror-Source', parent_mirror_source)
config.set('build','mirror-source', mirror_source)
config.set('build','parent-mirror-source', parent_mirror_source)
config.set('build','Mirror-Source-Security', mirror_source_security)
config.set('build','Parent-Mirror-Source-Security', parent_mirror_source_security)
config.set('build','mirror-source-security', mirror_source_security)
config.set('build','parent-mirror-source-security', parent_mirror_source_security)
config.set('build','Project', project)
config.set('build','System', system)
config.set('build','project', project)
config.set('build','system', system)
config.add_section('meta')
config.set('meta','Version', '4.0')
config.set('meta','version', '4.0')
config.write(configfile)
configfile.close()

36
functions/defaults.sh
View File

@ -11,65 +11,65 @@
New_configuration ()
{
# Version
LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build.conf Version)}"
LIVE_CONFIGURATION_VERSION="${LIVE_CONFIGURATION_VERSION:-$(Get_configuration config/build.conf version)}"
export LIVE_CONFIGURATION_VERSION
# Name
LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build.conf Name)}"
LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-$(Get_configuration config/build.conf name)}"
LIVE_IMAGE_NAME="${LIVE_IMAGE_NAME:-live-image}" # FIXME
export LIVE_IMAGE_NAME
# Architecture (FIXME: Support and default to 'any')
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build.conf Architecture)}"
LIVE_IMAGE_ARCHITECTURE="${LIVE_IMAGE_ARCHITECTURE:-$(Get_configuration config/build.conf architecture)}"
export LIVE_IMAGE_ARCHITECTURE
# Archive Areas
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build.conf Archive-Areas)}"
LIVE_IMAGE_ARCHIVE_AREAS="${LIVE_IMAGE_ARCHIVE_AREAS:-$(Get_configuration config/build.conf archive-areas)}"
export LIVE_IMAGE_ARCHIVE_AREAS
# Archive Areas
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build.conf Parent-Archive-Areas)}"
LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build.conf parent-archive-areas)}"
export LIVE_IMAGE_PARENT_ARCHIVE_AREAS
# Type
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build.conf Type)}"
LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build.conf type)}"
export LIVE_IMAGE_TYPE
# Mirrors
LB_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf Mirror-Bootstrap)"
LB_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf mirror-bootstrap)"
export LB_MIRROR_BOOTSTRAP
LB_PARENT_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf Parent-Mirror-Bootstrap)"
LB_PARENT_MIRROR_BOOTSTRAP="$(Get_configuration config/build.conf parent-mirror-bootstrap)"
export LB_PARENT_MIRROR_BOOTSTRAP
LB_MIRROR_CHROOT="$(Get_configuration config/build.conf Mirror-Chroot)"
LB_MIRROR_CHROOT="$(Get_configuration config/build.conf mirror-chroot)"
export LB_MIRROR_CHROOT
LB_PARENT_MIRROR_CHROOT="$(Get_configuration config/build.conf Parent-Mirror-Chroot)"
LB_PARENT_MIRROR_CHROOT="$(Get_configuration config/build.conf parent-mirror-chroot)"
export LB_MIRROR_CHROOT
LB_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf Mirror-Chroot-Security)"
LB_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf mirror-chroot-security)"
export LB_MIRROR_CHROOT_SECURITY
LB_PARENT_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf Parent-Mirror-Chroot-Security)"
LB_PARENT_MIRROR_CHROOT_SECURITY="$(Get_configuration config/build.conf parent-mirror-chroot-security)"
export LB_PARENT_MIRROR_CHROOT_SECURITY
LB_MIRROR_BINARY="$(Get_configuration config/build.conf Mirror-Binary)"
LB_MIRROR_BINARY="$(Get_configuration config/build.conf mirror-binary)"
export LB_MIRROR_BINARY
LB_PARENT_MIRROR_BINARY="$(Get_configuration config/build.conf Parent-Mirror-Binary)"
LB_PARENT_MIRROR_BINARY="$(Get_configuration config/build.conf parent-mirror-binary)"
export LB_PARENT_MIRROR_BINARY
LB_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf Mirror-Binary-Security)"
LB_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf mirror-binary-security)"
export LB_MIRROR_BINARY_SECURITY
LB_PARENT_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf Parent-Mirror-Binary-Security)"
LB_PARENT_MIRROR_BINARY_SECURITY="$(Get_configuration config/build.conf parent-mirror-binary-security)"
export LB_PARENT_MIRROR_BINARY_SECURITY
LB_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf Mirror-Installer)"
LB_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf mirror-installer)"
export LB_MIRROR_DEBIAN_INSTALLER
LB_PARENT_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf Parent-Mirror-Installer)"
LB_PARENT_MIRROR_DEBIAN_INSTALLER="$(Get_configuration config/build.conf parent-mirror-installer)"
export LB_PARENT_MIRROR_DEBIAN_INSTALLER
}