diff options
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/binary | 98 | ||||
| -rwxr-xr-x | scripts/build/binary_rootfs | 144 | ||||
| -rwxr-xr-x | scripts/build/bootstrap | 56 | ||||
| -rwxr-xr-x | scripts/build/build | 10 | ||||
| -rwxr-xr-x | scripts/build/chroot | 80 | ||||
| -rwxr-xr-x | scripts/build/installer | 56 | ||||
| -rwxr-xr-x | scripts/build/source | 32 |
7 files changed, 237 insertions, 239 deletions
diff --git a/scripts/build/binary b/scripts/build/binary index e1d28a241..bcef3f058 100755 --- a/scripts/build/binary +++ b/scripts/build/binary @@ -28,78 +28,78 @@ Init_config_data "${@}" Setup_clean_exit # Preparing root filesystem -lb binary_chroot ${@} +lb binary_chroot "${@}" if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Configuring chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_apt install-binary ${@} - lb chroot_archives chroot install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_apt install-binary "${@}" + lb chroot_archives chroot install "${@}" fi # Building root filesystem -lb binary_rootfs ${@} -lb binary_manifest ${@} +lb binary_rootfs "${@}" +lb binary_manifest "${@}" # Prepare images -lb binary_package-lists ${@} -lb binary_linux-image ${@} -lb binary_memtest ${@} -lb binary_grub-legacy ${@} -lb binary_grub-pc ${@} -lb binary_loopback_cfg ${@} -lb binary_syslinux ${@} -lb binary_disk ${@} -lb binary_loadlin ${@} -lb binary_win32-loader ${@} -lb binary_includes ${@} -lb binary_grub-efi ${@} -lb binary_hooks ${@} -lb binary_checksums ${@} +lb binary_package-lists "${@}" +lb binary_linux-image "${@}" +lb binary_memtest "${@}" +lb binary_grub-legacy "${@}" +lb binary_grub-pc "${@}" +lb binary_loopback_cfg "${@}" +lb binary_syslinux "${@}" +lb binary_disk "${@}" +lb binary_loadlin "${@}" +lb binary_win32-loader "${@}" +lb binary_includes "${@}" +lb binary_grub-efi "${@}" +lb binary_hooks "${@}" +lb binary_checksums "${@}" if [ "${LB_BUILD_WITH_CHROOT}" != "true" ] then - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" fi # Building images -lb binary_iso ${@} -lb binary_onie ${@} -lb binary_netboot ${@} -lb binary_tar ${@} -lb binary_hdd ${@} +lb binary_iso "${@}" +lb binary_onie "${@}" +lb binary_netboot "${@}" +lb binary_tar "${@}" +lb binary_hdd "${@}" -lb binary_zsync ${@} +lb binary_zsync "${@}" if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot Remove_stagefile chroot_archives - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" fi -lb chroot_sysfs remove ${@} -lb chroot_selinuxfs remove ${@} -lb chroot_proc remove ${@} -lb chroot_devpts remove ${@} +lb chroot_sysfs remove "${@}" +lb chroot_selinuxfs remove "${@}" +lb chroot_proc remove "${@}" +lb chroot_devpts remove "${@}" Echo_message "Binary stage completed" diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs index b0a9e22d4..97f25534a 100755 --- a/scripts/build/binary_rootfs +++ b/scripts/build/binary_rootfs @@ -135,34 +135,34 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives binary remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" rm -rf chroot mv chroot.tmp chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives binary install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives binary install "${@}" touch .lock else @@ -223,34 +223,34 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives binary remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" rm -rf chroot mv chroot.tmp chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives binary install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives binary install "${@}" touch .lock else @@ -358,34 +358,34 @@ case "${LB_CHROOT_FILESYSTEM}" in Remove_lockfile mv chroot/chroot chroot.tmp - lb chroot_archives binary remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives binary remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" rm -rf chroot mv chroot.tmp chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives binary install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives binary install "${@}" touch .lock else diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index f46075336..dcb4f710b 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -28,38 +28,38 @@ Init_config_data "${@}" Setup_clean_exit # Bootstrapping system -lb bootstrap_cache restore ${@} -lb bootstrap_debootstrap ${@} -lb bootstrap_cache save ${@} +lb bootstrap_cache restore "${@}" +lb bootstrap_debootstrap "${@}" +lb bootstrap_cache save "${@}" # Configuring chroot -lb chroot_devpts install ${@} -lb chroot_proc install ${@} -lb chroot_selinuxfs install ${@} -lb chroot_sysfs install ${@} -lb chroot_debianchroot install ${@} -lb chroot_dpkg install ${@} -lb chroot_tmpfs install ${@} -lb chroot_sysv-rc install ${@} -lb chroot_hosts install ${@} -lb chroot_resolv install ${@} -lb chroot_hostname install ${@} -lb chroot_apt install ${@} +lb chroot_devpts install "${@}" +lb chroot_proc install "${@}" +lb chroot_selinuxfs install "${@}" +lb chroot_sysfs install "${@}" +lb chroot_debianchroot install "${@}" +lb chroot_dpkg install "${@}" +lb chroot_tmpfs install "${@}" +lb chroot_sysv-rc install "${@}" +lb chroot_hosts install "${@}" +lb chroot_resolv install "${@}" +lb chroot_hostname install "${@}" +lb chroot_apt install "${@}" -lb bootstrap_archives binary ${@} +lb bootstrap_archives binary "${@}" # Deconfiguring chroot -lb chroot_apt remove ${@} -lb chroot_hostname remove ${@} -lb chroot_resolv remove ${@} -lb chroot_hosts remove ${@} -lb chroot_sysv-rc remove ${@} -lb chroot_tmpfs remove ${@} -lb chroot_dpkg remove ${@} -lb chroot_debianchroot remove ${@} -lb chroot_sysfs remove ${@} -lb chroot_selinuxfs remove ${@} -lb chroot_proc remove ${@} -lb chroot_devpts remove ${@} +lb chroot_apt remove "${@}" +lb chroot_hostname remove "${@}" +lb chroot_resolv remove "${@}" +lb chroot_hosts remove "${@}" +lb chroot_sysv-rc remove "${@}" +lb chroot_tmpfs remove "${@}" +lb chroot_dpkg remove "${@}" +lb chroot_debianchroot remove "${@}" +lb chroot_sysfs remove "${@}" +lb chroot_selinuxfs remove "${@}" +lb chroot_proc remove "${@}" +lb chroot_devpts remove "${@}" Echo_message "Bootstrap stage completed" diff --git a/scripts/build/build b/scripts/build/build index 100a23c8c..4adc3ee8d 100755 --- a/scripts/build/build +++ b/scripts/build/build @@ -55,19 +55,19 @@ Echo_message "live-build ${LIVE_BUILD_VERSION}" Echo_message "Building for a ${LB_MODE}/${LB_DISTRIBUTION_BINARY}/${LB_ARCHITECTURES} system" # Stage #1: Bootstrap new root filesystem -lb bootstrap ${@} +lb bootstrap "${@}" # Stage #2: Build live OS file system -lb chroot ${@} +lb chroot "${@}" # Stage #3: Build installer components -lb installer ${@} +lb installer "${@}" # Stage #4: Build binary (live disc) images -lb binary ${@} +lb binary "${@}" # Stage #5: Build supplimentary source disc images -lb source ${@} +lb source "${@}" if [ "${_COLOR_OUT}" = "false" ]; then Echo_message "Build completed successfully" diff --git a/scripts/build/chroot b/scripts/build/chroot index 09c09e15e..ad15ff0a2 100755 --- a/scripts/build/chroot +++ b/scripts/build/chroot @@ -28,63 +28,61 @@ Init_config_data "${@}" Setup_clean_exit # Restoring cached live OS chroot from cache -lb chroot_cache restore ${@} +lb chroot_cache restore "${@}" # Configuring chroot -lb chroot_devpts install ${@} -lb chroot_proc install ${@} -lb chroot_selinuxfs install ${@} -lb chroot_sysfs install ${@} -lb chroot_debianchroot install ${@} -lb chroot_dpkg install ${@} -lb chroot_tmpfs install ${@} -lb chroot_sysv-rc install ${@} -lb chroot_hosts install ${@} -lb chroot_resolv install ${@} -lb chroot_hostname install ${@} -lb chroot_apt install ${@} -lb chroot_archives chroot install ${@} +lb chroot_devpts install "${@}" +lb chroot_proc install "${@}" +lb chroot_selinuxfs install "${@}" +lb chroot_sysfs install "${@}" +lb chroot_debianchroot install "${@}" +lb chroot_dpkg install "${@}" +lb chroot_tmpfs install "${@}" +lb chroot_sysv-rc install "${@}" +lb chroot_hosts install "${@}" +lb chroot_resolv install "${@}" +lb chroot_hostname install "${@}" +lb chroot_apt install "${@}" +lb chroot_archives chroot install "${@}" # Customizing chroot -lb chroot_linux-image ${@} -lb chroot_firmware ${@} -lb chroot_preseed ${@} +lb chroot_linux-image "${@}" +lb chroot_firmware "${@}" +lb chroot_preseed "${@}" -for _PASS in install live -do - lb chroot_package-lists ${_PASS} ${@} - lb chroot_install-packages ${_PASS} ${@} +for _PASS in install live; do + lb chroot_package-lists ${_PASS} "${@}" + lb chroot_install-packages ${_PASS} "${@}" - if [ "${_PASS}" = install ] - then + if [ "${_PASS}" = install ]; then Chroot chroot "dpkg-query -W" > chroot.packages.install fi done -lb chroot_includes ${@} -lb chroot_hooks ${@} -lb chroot_hacks ${@} -lb chroot_interactive ${@} +lb chroot_includes "${@}" +lb chroot_hooks "${@}" +lb chroot_hacks "${@}" +lb chroot_interactive "${@}" Chroot chroot "dpkg-query -W" > chroot.packages.live # Deconfiguring chroot -lb chroot_archives chroot remove ${@} -lb chroot_apt remove ${@} -lb chroot_hostname remove ${@} -lb chroot_resolv remove ${@} -lb chroot_hosts remove ${@} -lb chroot_sysv-rc remove ${@} -lb chroot_tmpfs remove ${@} -lb chroot_dpkg remove ${@} -lb chroot_debianchroot remove ${@} -lb chroot_sysfs remove ${@} -lb chroot_selinuxfs remove ${@} -lb chroot_proc remove ${@} -lb chroot_devpts remove ${@} +lb chroot_archives chroot remove "${@}" +lb chroot_apt remove "${@}" +lb chroot_hostname remove "${@}" +lb chroot_resolv remove "${@}" +lb chroot_hosts remove "${@}" +lb chroot_sysv-rc remove "${@}" +lb chroot_tmpfs remove "${@}" +lb chroot_dpkg remove "${@}" +lb chroot_debianchroot remove "${@}" +lb chroot_sysfs remove "${@}" +lb chroot_selinuxfs remove "${@}" +lb chroot_proc remove "${@}" +lb chroot_devpts remove "${@}" # Saving live OS chroot to cache -lb chroot_cache save ${@} +lb chroot_cache save "${@}" Chroot chroot "ls -lR" > chroot.files diff --git a/scripts/build/installer b/scripts/build/installer index 56ed724f4..3054861dc 100755 --- a/scripts/build/installer +++ b/scripts/build/installer @@ -30,41 +30,41 @@ Setup_clean_exit if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Configuring chroot - lb chroot_devpts install ${@} - lb chroot_proc install ${@} - lb chroot_selinuxfs install ${@} - lb chroot_sysfs install ${@} - lb chroot_debianchroot install ${@} - lb chroot_dpkg install ${@} - lb chroot_tmpfs install ${@} - lb chroot_sysv-rc install ${@} - lb chroot_hosts install ${@} - lb chroot_resolv install ${@} - lb chroot_hostname install ${@} - lb chroot_apt install ${@} - lb chroot_archives chroot install ${@} + lb chroot_devpts install "${@}" + lb chroot_proc install "${@}" + lb chroot_selinuxfs install "${@}" + lb chroot_sysfs install "${@}" + lb chroot_debianchroot install "${@}" + lb chroot_dpkg install "${@}" + lb chroot_tmpfs install "${@}" + lb chroot_sysv-rc install "${@}" + lb chroot_hosts install "${@}" + lb chroot_resolv install "${@}" + lb chroot_hostname install "${@}" + lb chroot_apt install "${@}" + lb chroot_archives chroot install "${@}" fi # Building installer -lb installer_debian-installer ${@} -lb installer_preseed ${@} +lb installer_debian-installer "${@}" +lb installer_preseed "${@}" if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] then # Deconfiguring chroot - lb chroot_archives chroot remove ${@} - lb chroot_apt remove ${@} - lb chroot_hostname remove ${@} - lb chroot_resolv remove ${@} - lb chroot_hosts remove ${@} - lb chroot_sysv-rc remove ${@} - lb chroot_tmpfs remove ${@} - lb chroot_dpkg remove ${@} - lb chroot_debianchroot remove ${@} - lb chroot_sysfs remove ${@} - lb chroot_selinuxfs remove ${@} - lb chroot_proc remove ${@} - lb chroot_devpts remove ${@} + lb chroot_archives chroot remove "${@}" + lb chroot_apt remove "${@}" + lb chroot_hostname remove "${@}" + lb chroot_resolv remove "${@}" + lb chroot_hosts remove "${@}" + lb chroot_sysv-rc remove "${@}" + lb chroot_tmpfs remove "${@}" + lb chroot_dpkg remove "${@}" + lb chroot_debianchroot remove "${@}" + lb chroot_sysfs remove "${@}" + lb chroot_selinuxfs remove "${@}" + lb chroot_proc remove "${@}" + lb chroot_devpts remove "${@}" fi Echo_message "Installer stage completed" diff --git a/scripts/build/source b/scripts/build/source index 3b67f81c1..7e03c337c 100755 --- a/scripts/build/source +++ b/scripts/build/source @@ -33,27 +33,27 @@ fi Setup_clean_exit # Configuring chroot (enabling networking) -lb chroot_hosts install ${@} -lb chroot_resolv install ${@} -lb chroot_hostname install ${@} -lb chroot_archives source install ${@} +lb chroot_hosts install "${@}" +lb chroot_resolv install "${@}" +lb chroot_hostname install "${@}" +lb chroot_archives source install "${@}" # Preparing images -lb source_live ${@} -lb source_debian ${@} -lb source_disk ${@} -lb source_hooks ${@} -lb source_checksums ${@} +lb source_live "${@}" +lb source_debian "${@}" +lb source_disk "${@}" +lb source_hooks "${@}" +lb source_checksums "${@}" # Building images -lb source_iso ${@} -lb source_tar ${@} -lb source_hdd ${@} +lb source_iso "${@}" +lb source_tar "${@}" +lb source_hdd "${@}" # Deconfiguring chroot -lb chroot_archives source remove ${@} -lb chroot_hostname remove ${@} -lb chroot_resolv remove ${@} -lb chroot_hosts remove ${@} +lb chroot_archives source remove "${@}" +lb chroot_hostname remove "${@}" +lb chroot_resolv remove "${@}" +lb chroot_hosts remove "${@}" Echo_message "Source stage completed" |