Handling bootstrap cache inside the bootstrap stubs itself.
This commit is contained in:
Daniel Baumann
parent
83dacd9b39
commit
5603355e1d
|
|
@ -106,6 +106,20 @@ def main():
|
|||
|
||||
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.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:
|
||||
|
|
@ -151,6 +165,15 @@ def main():
|
|||
|
||||
cdebootstrap = subprocess.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.call('cp -a chroot cache/bootstrap', shell=True)
|
||||
|
||||
## stagefile
|
||||
os.makedirs('.build', exist_ok=True)
|
||||
open('.build/bootstrap', 'w').close()
|
||||
|
|
|
|||
|
|
@ -111,6 +111,20 @@ def main():
|
|||
|
||||
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.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:
|
||||
|
|
@ -148,6 +162,15 @@ def main():
|
|||
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.call('cp -a chroot cache/bootstrap', shell=True)
|
||||
|
||||
## stagefile
|
||||
os.makedirs('.build', exist_ok=True)
|
||||
open('.build/bootstrap', 'w').close()
|
||||
|
|
|
|||
|
|
@ -35,7 +35,6 @@ Set_defaults
|
|||
Setup_cleanup
|
||||
|
||||
# Bootstrapping system
|
||||
lb bootstrap_cache restore ${@}
|
||||
lb bootstrap_${LB_BOOTSTRAP}
|
||||
|
||||
# Configuring chroot
|
||||
|
|
@ -70,5 +69,3 @@ lb chroot_sysfs remove ${@}
|
|||
lb chroot_selinuxfs remove ${@}
|
||||
lb chroot_proc remove ${@}
|
||||
lb chroot_devpts remove ${@}
|
||||
|
||||
lb bootstrap_cache save ${@}
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
## live-build(7) - System Build Scripts
|
||||
## Copyright (C) 2006-2013 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.
|
||||
|
||||
|
||||
set -e
|
||||
|
||||
# Including common functions
|
||||
[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh
|
||||
|
||||
# Setting static variables
|
||||
DESCRIPTION="$(Echo 'cache bootstrap stage')"
|
||||
HELP=""
|
||||
USAGE="${PROGRAM} [--force]"
|
||||
|
||||
Arguments "${@}"
|
||||
|
||||
# Reading configuration files
|
||||
Read_conffiles config/all config/common config/bootstrap config/chroot config/binary config/source
|
||||
Set_defaults
|
||||
|
||||
for STAGE in ${LB_CACHE_STAGES}
|
||||
do
|
||||
if [ "${STAGE}" = "bootstrap" ]
|
||||
then
|
||||
case "${1}" in
|
||||
restore)
|
||||
Echo_message "Restoring bootstrap stage from cache..."
|
||||
|
||||
# Checking stage file
|
||||
Check_stagefile .build/bootstrap
|
||||
|
||||
if [ -d cache/bootstrap ]
|
||||
then
|
||||
# Checking lock file
|
||||
Check_lockfile .lock
|
||||
|
||||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
# Removing old chroot
|
||||
rm -rf chroot
|
||||
|
||||
# Restoring old cache
|
||||
cp -a cache/bootstrap chroot
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/bootstrap
|
||||
|
||||
exit 0
|
||||
fi
|
||||
;;
|
||||
|
||||
save)
|
||||
Echo_message "Saving bootstrap stage to cache..."
|
||||
|
||||
# Checking stage file
|
||||
Check_stagefile .build/bootstrap_cache.save
|
||||
|
||||
# Checking lock file
|
||||
Check_lockfile .lock
|
||||
|
||||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
rm -rf cache/bootstrap
|
||||
|
||||
mkdir -p cache
|
||||
|
||||
cp -a chroot cache/bootstrap
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/bootstrap_cache.save
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
done
|
||||
Loading…
Reference in New Issue