diff options
| -rwxr-xr-x | scripts/build/bootstrap_cdebootstrap | 27 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 21 |
2 files changed, 27 insertions, 21 deletions
diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index c5e1641a0..62ee7bef9 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -1,6 +1,6 @@ #!/usr/bin/python -## live-build(7) - System Build Scripts +## live-build(7) - Live Systems Build Components ## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch> ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -17,11 +17,11 @@ import subprocess import sys -# TODO: -# - lockfile handling -# - cdebootstrap-options from config -# - use gettext for i18n -# - take mirrors from config/archives/debian.{bootstrap,chroot} +# TODOs: +# * lockfile handling +# * cdebootstrap-options from config +# * use gettext for i18n +# * take mirrors from config/archives/debian.{bootstrap,chroot} def main(): ## Parsing Arguments @@ -109,7 +109,8 @@ def main(): if verbose: print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/bootstrap/*.deb') - # Note: copy instead of move to make cache survive incomplete build + # Notes: + # * copy instead of move to make cache survive incomplete build os.makedirs('chroot/var/cache/bootstrap', exist_ok=True) for package in glob.glob('cache/packages.bootstrap/*.deb'): @@ -119,9 +120,10 @@ def main(): if verbose: print('I: Calling \'/usr/bin/debootstrap --download-only ' + cdebootstrap_options + '\'') - # Note: calling cdebootstrap twice: - # - to use already downloaded /var/cache/bootstrap/*.deb on incomplete builds - # - to use /var/cache/boottrap/*.deb for debian-installer + # Notes: + # * calling cdebootstrap twice: + # - to use already downloaded /var/cache/bootstrap/*.deb on incomplete builds + # - to use /var/cache/boottrap/*.deb for debian-installer cdebootstrap = subprocess.call('/usr/bin/cdebootstrap --download-only ' + cdebootstrap_options, shell=True) # package cache @@ -129,8 +131,9 @@ def main(): if verbose: print('I: Copying chroot/var/cache/bootstrap/*.deb to cache/packages.bootstrap') - # Notes: - remove first to keep cache minimal - # - remove files instead of directory to work with symlinked directory + # Notes: + # * remove first to keep cache minimal + # * remove files instead of directory to work with symlinked directory for package in glob.glob('cache/packages.bootstrap/*.deb'): os.remove(package) diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index 963d9db75..07d2fb8b9 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -1,6 +1,6 @@ #!/usr/bin/python -## live-build(7) - System Build Scripts +## live-build(7) - Live Systems Build Components ## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch> ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -18,10 +18,10 @@ import sys # TODO: -# - lockfile handling -# - debootstrap-options from config -# - use gettext for i18n -# - take mirrors from config/archives/debian.{bootstrap,chroot} +# * lockfile handling +# * debootstrap-options from config +# * use gettext for i18n +# * take mirrors from config/archives/debian.{bootstrap,chroot} def main(): ## Parsing Arguments @@ -114,7 +114,8 @@ def main(): if verbose: print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/apt/archives/*.deb') - # Note: copy instead of move to make cache survive incomplete build + # Notes: + # * copy instead of move to make cache survive incomplete build os.makedirs('chroot/var/cache/apt/archives', exist_ok=True) for package in glob.glob('cache/packages.bootstrap/*.deb'): @@ -132,14 +133,16 @@ def main(): if verbose: print('I: Copying chroot/var/cache/apt/archives/*.deb to cache/packages.bootstrap') - # Note: remove first to keep cache minimal, - # remove files instead of directory to work with symlinked directory + # Notes: + # * remove first to keep cache minimal, + # * remove files instead of directory to work with symlinked directory for package in glob.glob('cache/packages.bootstrap/*.deb'): os.remove(package) os.makedirs('cache/packages.bootstrap', exist_ok=True) - # Note: move instead of copy to keep stage minimal + # Notes: + # * move instead of copy to keep stage minimal for package in glob.glob('chroot/var/cache/apt/archives/*.deb'): shutil.move(package, 'cache/packages.bootstrap') |