Commit bc50443c authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Moving partial python rewrite to separate branch, let's do it in the jessie+1...

Moving partial python rewrite to separate branch, let's do it in the jessie+1 cycle rather than go with the current mixed code.
parent 5fc57865
......@@ -49,7 +49,6 @@ install:
mkdir -p $(DESTDIR)/usr/lib/live
cp -a scripts/* $(DESTDIR)/usr/lib/live
cp -a components/* $(DESTDIR)/usr/lib/live/build
# Installing documentation
mkdir -p $(DESTDIR)/usr/share/doc/live-build
......
live-build 4.x is transitioning from shell scripts to Python scripts.
In order to ensure a smooth transition without breaks until completion,
one component at the time is being rewritten and re-documented without
interconnection between them.
Once done, the newly Python sources will be shaped into modules and
subcommands properly.
---
Some notes on coding style:
* live-build commands should be *prefixed* with the stage:
chroot-includes, not includes-chroot; -> tab-completion
* directories/files in the config directory should be *suffixed* with the stage:
includes.chroot, not chroot.includes; -> sort-order
* cli arguments should be *suffixed* with the stage:
--mirror-bootstrap, not --bootstrap-mirror; -> tab-completion
#!/usr/bin/python3
## live-build(7) - Live System Build Components
## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
import argparse
import configparser
import glob
import os
import shutil
import subprocess
import sys
# TODO:
# * logfile output
# * lockfile handling
# * use gettext for i18n
def main():
## Parsing Arguments
arguments = argparse.ArgumentParser(
prog = 'lb binary-hooks',
usage = '%(prog)s [arguments]',
description = '''live-build contains the components to build a live system from a configuration directory.
The binary-hooks command executes hook files after the binary stage.''',
epilog = 'See \'man lb-binary-hooks\' for more information.',
formatter_class = argparse.ArgumentDefaultsHelpFormatter
)
arguments.add_argument('--version', help='show program\'s version number and exit', action='version', version='live-build 4')
arguments.add_argument('--verbose', help='set verbose option', action='store_true')
args = arguments.parse_args()
# --verbose
verbose = args.verbose
## Calling binary hooks
# stagefile
if os.path.isfile('.build/binary-hooks'):
if verbose:
print('I: binary-hooks already done - nothing to do')
sys.exit(0)
# dependencies
if not os.path.isfile('.build/bootstrap'):
print('E: bootstrap stage missing - aborting', file=sys.stderr)
if verbose:
print('I: use \'lb bootstrap\' to bootstrap system')
sys.exit(1)
# hooks
if not glob.glob('config/hooks/*.hook') and not glob.glob('config/hooks/*.hook.binary'):
if verbose:
print ('I: no binary hooks found at config/hooks/*.hook{,.binary} - nothing to do')
sys.exit(0)
# bind mount configuration directory
if verbose:
print('I: Mounting config to binary/live-build/config')
os.makedirs('binary/live-build/config', exist_ok=True)
mount = subprocess.check_call('mount -o bind config binary/live-build/config', shell=True)
remount = subprocess.check_call('mount -o remount,ro,bind binary/live-build/config', shell=True)
# process hooks
os.makedirs('binary/live-build', exist_ok=True)
hooks = glob.glob('config/hooks/*.hook') + glob.glob('config/hooks/*.hook.binary')
for hook in sorted(hooks):
if verbose:
print('I: Copying config/hooks/*.hook.binary to binary/live-build')
shutil.copy(hook, os.path.join('binary/live-build/' + os.path.basename(hook)), follow_symlinks=True)
if verbose:
print('I: Executing \' ' + hook + '\'')
os.chmod(hook, 0o755)
exec_hook = subprocess.check_call('cd binary && live-build/' + os.path.basename(hook), shell=True)
os.remove('binary/live-build/' + os.path.basename(hook))
# unmount coniguration directory
umount = subprocess.check_call('umount binary/live-build/config', shell=True)
os.rmdir('binary/live-build/config')
os.rmdir('binary/live-build')
## stagefile
os.makedirs('.build', exist_ok=True)
open('.build/binary-hooks', 'w').close()
if __name__ == '__main__':
main()
#!/usr/bin/python3
## live-build(7) - Live System Build Components
## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
import argparse
import configparser
import glob
import os
import shutil
import subprocess
import sys
# TODO:
# * logfile output
# * lockfile handling
# * use gettext for i18n
# * derefence or remove symlinks if binary filesystem does not support them
def main():
## Parsing Arguments
arguments = argparse.ArgumentParser(
prog = 'lb binary-includes',
usage = '%(prog)s [arguments]',
description = '''live-build contains the components to build a live system from a configuration directory.
The binary-includes command copies include files into the binary stage.''',
epilog = 'See \'man lb-binary-includes\' for more information.',
formatter_class = argparse.ArgumentDefaultsHelpFormatter
)
arguments.add_argument('--version', help='show program\'s version number and exit', action='version', version='live-build 4')
arguments.add_argument('--verbose', help='set verbose option', action='store_true')
args = arguments.parse_args()
# --verbose
verbose = args.verbose
## Copying binary includes
# stagefile
if os.path.isfile('.build/binary-includes'):
if verbose:
print('I: binary-includes already done - nothing to do')
sys.exit(0)
# dependencies
if not os.path.isfile('.build/bootstrap'):
print('E: bootstrap stage missing - aborting', file=sys.stderr)
if verbose:
print('I: use \'lb bootstrap\' to bootstrap system')
sys.exit(1)
if not os.path.isfile('/bin/cpio'):
print('E: /bin/cpio - no such file', file=sys.stderr)
if verbose:
print('I: cpio can be obtained from:\n'
'I: http://www.gnu.org/software/cpio/\n'
'I: http://ftp.gnu.org/gnu/cpio/\n'
'I: On Debian based systems, cpio can be installed with:\n'
'I: # sudo apt-get install cpio')
sys.exit(1)
# includes
if not glob.glob('config/includes/*') and not glob.glob('config/includes/.*') and not glob.glob('config/includes.binary/*') and not glob.glob('config/includes.binary/.*'):
if verbose:
print ('I: no binary includes found at config/includes{,.binary} - nothing to do')
sys.exit(0)
# process includes
if glob.glob('config/includes/*') or glob.glob('config/includes/.*'):
if verbose:
print('I: Copying config/includes to binary')
cpio = subprocess.check_call('cd config/includes && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
if glob.glob('config/includes.binary/*') or glob.glob('config/includes.binary/.*'):
if verbose:
print('I: Copying config/includes.binary to binary')
cpio = subprocess.check_call('cd config/includes.binary && find . | cpio -dmpu --no-preserve-owner ../../binary', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
open('.build/binary-includes', 'w').close()
if __name__ == '__main__':
main()
#!/usr/bin/python3
## live-build(7) - Live System Build Components
## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
import argparse
import configparser
import glob
import os
import shutil
import subprocess
import sys
# TODO:
# * logfile output
# * lockfile handling
# * use gettext for i18n
# * cdebootstrap-options from config/options/cdebootstrap
# * take mirrors from config/archives/mirror.{bootstrap,chroot}
def main():
## Parsing Arguments
arguments = argparse.ArgumentParser(
prog = 'lb bootstrap-cdebootstrap',
usage = '%(prog)s [arguments]',
description = '''live-build contains the components to build a live system from a configuration directory.
The bootstrap-cdebootstrap command bootstraps the chroot system with cdebootstrap.''',
epilog = 'See \'man lb-bootstrap-cdebootstrap\' for more information.',
formatter_class = argparse.ArgumentDefaultsHelpFormatter
)
arguments.add_argument('--version', help='show program\'s version number and exit', action='version', version='live-build 4')
arguments.add_argument('--verbose', help='set verbose option', action='store_true')
arguments.add_argument('--cdebootstrap-options', help='set cdebootstrap(1) options' )
args = arguments.parse_args()
## Parsing Configuration
if not os.path.isfile('config/build'):
print('E: config/build - no such file', file=sys.stderr)
sys.exit(1)
config = configparser.ConfigParser()
config.read('config/build')
try:
architecture = config.get('Image', 'Architecture')
distribution = config.get('Image', 'Parent-Distribution')
mirror_bootstrap = config.get('Image', 'Parent-Mirror-Bootstrap')
except:
distribution = config.get('Image', 'Distribution')
mirror_bootstrap = config.get('Image', 'Mirror-Bootstrap')
# --verbose
verbose = args.verbose
# --cdebootstrap-options
cdebootstrap_options_late = distribution + ' chroot ' + mirror_bootstrap
cdebootstrap_options_early = ''
if (architecture) and (not architecture == 'auto'):
cdebootstrap_options_early = cdebootstrap_options_early + ' --arch=' + architecture
if args.cdebootstrap_options:
cdebootstrap_options = cdebootstrap_options_early + ' ' + args.cdebootstrap_options + ' ' + cdebootstrap_options_late
else:
cdebootstrap_options = cdebootstrap_options_early + ' ' + cdebootstrap_options_late
## Calling cdebootstrap
# stagefile
if os.path.isfile('.build/bootstrap'):
if verbose:
print('I: bootstrap already done - nothing to do')
sys.exit(0)
# dependencies
if not os.path.isfile('/usr/bin/cdebootstrap'):
print('E: /usr/bin/cdebootstrap - no such file', file=sys.stderr)
if verbose:
print('I: cdebootstrap can be obtained from:\n'
'I: http://anonscm.debian.org/gitweb/?p=users/waldi/cdebootstrap.git\n'
'I: http://ftp.debian.org/debian/pool/main/c/cdebootstrap/\n'
'I: On Debian based systems, cdebootstrap can be installed with:\n'
'I: # sudo apt-get install cdebootstrap')
sys.exit(1)
# clean
if os.path.exists('chroot'):
print('E: chroot already exists - unclean build', file=sys.stderr)
if verbose:
print('I: use \'lb clean\' to clean up a previously incomplete build')
sys.exit(1)
# stage cache
if os.path.exists('cache/bootstrap'):
if verbose:
print('I: Copying cache/bootstrap to chroot')
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.check_call('cp -a cache/bootstrap chroot', shell=True)
os.makedirs('.build', exist_ok=True)
open('.build/bootstrap', 'w').close()
sys.exit(0)
# packages cache
if glob.glob('cache/packages.bootstrap/*.deb'):
if verbose:
print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/bootstrap/*.deb')
# 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'):
os.link(package, os.path.join('chroot/var/cache/bootstrap/' + os.path.basename(package)))
else:
# cdebootstrap
if verbose:
print('I: Calling \'/usr/bin/debootstrap --download-only ' + cdebootstrap_options + '\'')
# 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.check_call('/usr/bin/cdebootstrap --download-only ' + cdebootstrap_options, shell=True)
# package cache
if glob.glob('chroot/var/cache/bootstrap/*.deb'):
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
for package in glob.glob('cache/packages.bootstrap/*.deb'):
os.remove(package)
os.makedirs('cache/packages.bootstrap', exist_ok=True)
for package in glob.glob('chroot/var/cache/bootstrap/*.deb'):
shutil.copy2(package, 'cache/packages.bootstrap')
# cdebootstrap
if not os.path.exists('chroot/bin'):
if verbose:
print('I: Calling \'/usr/bin/debootstrap ' + cdebootstrap_options + '\'')
cdebootstrap = subprocess.check_call('/usr/bin/cdebootstrap ' + cdebootstrap_options, shell=True)
# stage cache
if not os.path.exists('cache/bootstrap'):
if verbose:
print('I: Copying chroot to cache/bootstrap')
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.check_call('cp -a chroot cache/bootstrap', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
open('.build/bootstrap', 'w').close()
if __name__ == '__main__':
main()
#!/usr/bin/python3
## live-build(7) - Live System Build Components
## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.
import argparse
import configparser
import glob
import os
import shutil
import subprocess
import sys
# TODO:
# * logfile output
# * lockfile handling
# * use gettext for i18n
# * debootstrap-options from config/options/debootstrap
# * take mirrors from config/archives/mirror.{bootstrap,chroot}
def main():
## Parsing Arguments
arguments = argparse.ArgumentParser(
prog = 'lb bootstrap-debootstrap',
usage = '%(prog)s [arguments]',
description = '''live-build contains the components to build a live system from a configuration directory.
The bootstrap-debootstrap command bootstraps the chroot system with debootstrap.''',
epilog = 'See \'man lb-bootstrap-debootstrap\' for more information.',
formatter_class = argparse.ArgumentDefaultsHelpFormatter
)
arguments.add_argument('--version', help='show program\'s version number and exit', action='version', version='live-build 4')
arguments.add_argument('--verbose', help='set verbose option', action='store_true')
arguments.add_argument('--debootstrap-options', help='set debootstrap(8) options' )
args = arguments.parse_args()
## Parsing Configuration
if not os.path.isfile('config/build'):
print('E: config/build - no such file', file=sys.stderr)
sys.exit(1)
config = configparser.ConfigParser()
config.read('config/build')
try:
architecture = config.get('Image', 'Architecture')
archive_areas = config.get('Image', 'Parent-Archive-Areas')
distribution = config.get('Image', 'Parent-Distribution')
mirror_bootstrap = config.get('Image', 'Parent-Mirror-Bootstrap')
except:
archive_areas = config.get('Image', 'Archive-Areas')
distribution = config.get('Image', 'Distribution')
mirror_bootstrap = config.get('Image', 'Mirror-Bootstrap')
# --verbose
verbose = args.verbose
# --debootstrap-options
debootstrap_options_late = distribution + ' chroot ' + mirror_bootstrap
debootstrap_options_early = ''
if (architecture) and (not architecture == 'auto'):
debootstrap_options_early = debootstrap_options_early + ' --arch=' + architecture
if (archive_areas) and (not archive_areas == 'main'):
debootstrap_options_early = debootstrap_options_early + ' --components=' + archive_areas.replace(' ',',')
if args.debootstrap_options:
debootstrap_options = debootstrap_options_early + ' ' + args.debootstrap_options + ' ' + debootstrap_options_late
else:
debootstrap_options = debootstrap_options_early + ' ' + debootstrap_options_late
## Calling debootstrap
# stagefile
if os.path.isfile('.build/bootstrap'):
if verbose:
print('I: bootstrap already done - nothing to do')
sys.exit(0)
# dependencies
if not os.path.isfile('/usr/sbin/debootstrap'):
print('E: /usr/sbin/debootstrap - no such file', file=sys.stderr)
if verbose:
print('I: debootstrap can be obtained from:\n'
'I: http://anonscm.debian.org/gitweb/?p=d-i/debootstrap.git\n'
'I: http://ftp.debian.org/debian/pool/main/d/debootstrap/\n'
'I: On Debian based systems, debootstrap can be installed with:\n'
'I: # sudo apt-get install debootstrap')
sys.exit(1)
# clean
if os.path.exists('chroot'):
print('E: chroot already exists - unclean build', file=sys.stderr)
if verbose:
print('I: use \'lb clean\' to clean up a previously incomplete build')
sys.exit(1)
# stage cache
if os.path.exists('cache/bootstrap'):
if verbose:
print('I: Copying cache/bootstrap to chroot')
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.check_call('cp -a cache/bootstrap chroot', shell=True)
os.makedirs('.build', exist_ok=True)
open('.build/bootstrap', 'w').close()
sys.exit(0)
# packages cache
if glob.glob('cache/packages.bootstrap/*.deb'):
if verbose:
print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/apt/archives/*.deb')
# 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'):
os.link(package, os.path.join('chroot/var/cache/apt/archives/' + os.path.basename(package)))
# debootstrap
if not os.path.exists('chroot/bin'):
if verbose:
print('I: Calling \'/usr/sbin/debootstrap ' + debootstrap_options + '\'')
debootstrap = subprocess.check_call('/usr/sbin/debootstrap ' + debootstrap_options, shell=True)
# package cache
if glob.glob('chroot/var/cache/apt/archives/*.deb'):
if verbose:
print('I: Copying chroot/var/cache/apt/archives/*.deb to cache/packages.bootstrap')
# 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)
# 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')
# stage cache
if not os.path.exists('cache/bootstrap'):
if verbose:
print('I: Copying chroot to cache/bootstrap')
# Notes:
# * there's no Python equivalent to 'cp -a' that handels both symlinks and device nodes properly.
cache = subprocess.check_call('cp -a chroot cache/bootstrap', shell=True)
# stagefile
os.makedirs('.build', exist_ok=True)
open('.build/bootstrap', 'w').close()
if __name__ == '__main__':
main()
#!/usr/bin/python3
## live-build(7) - Live System Build Components
## Copyright (C) 2006-2014 Daniel Baumann <mail@daniel-baumann.ch>
##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
## This is free software, and you are welcome to redistribute it
## under certain conditions; see COPYING for details.